resolved conflicts for merge of 01beea4b to master

Change-Id: I340c31de8ece1580a9a6ab9370b9815ecdd54b49

diff --cc bta/dm/bta_dm_cfg.c
index fd7e551,73daac0..aea6fb8
--- 1/bta/dm/bta_dm_cfg.c
--- 2/bta/dm/bta_dm_cfg.c
+++ b/bta/dm/bta_dm_cfg.c
@@@ -111,14 -111,16 +111,16 @@@ tBTA_DM_CFG *p_bta_dm_cfg = (tBTA_DM_CF
  tBTA_DM_RM *p_bta_dm_rm_cfg = (tBTA_DM_RM *)&bta_dm_rm_cfg;
  
  #if BLE_INCLUDED == TRUE
- #define BTA_DM_NUM_PM_ENTRY         (19+BTA_DM_NUM_JV_ID)  /* number of entries in bta_dm_pm_cfg except the first */
++#  define BTA_DM_NUM_PM_ENTRY         22  /* number of entries in bta_dm_pm_cfg except the first */
++#  define BTA_DM_NUM_PM_SPEC          14  /* number of entries in bta_dm_pm_spec */
 +#else
- #define BTA_DM_NUM_PM_ENTRY         (17+BTA_DM_NUM_JV_ID)  /* number of entries in bta_dm_pm_cfg except the first */
+ #  define BTA_DM_NUM_PM_ENTRY         20  /* number of entries in bta_dm_pm_cfg except the first */
+ #  define BTA_DM_NUM_PM_SPEC          12  /* number of entries in bta_dm_pm_spec */
 -#else
 -#  define BTA_DM_NUM_PM_ENTRY         18  /* number of entries in bta_dm_pm_cfg except the first */
 -#  define BTA_DM_NUM_PM_SPEC          10  /* number of entries in bta_dm_pm_spec */
  #endif
  
- tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[] =
+ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] =
  {
-   {BTA_ID_SYS, BTA_DM_NUM_PM_ENTRY, 0},
+   {BTA_ID_SYS, BTA_DM_NUM_PM_ENTRY, 0},  /* reserved: specifies length of this table. */
    {BTA_ID_AG,  BTA_ALL_APP_ID,      0},  /* ag uses first spec table for app id 0 */
    {BTA_ID_CT,  1,                   1},  /* ct (BTA_ID_CT,APP ID=1) spec table */
    {BTA_ID_CG,  BTA_ALL_APP_ID,      1},  /* cg resue ct spec table */