resolved conflicts for merge of bd42d7bd to mnc-dr-dev-plus-aosp

Change-Id: Id1c6a57dd8db421eb233e0b9d73a6ef232bac35c

diff --cc btif/src/btif_dm.c
index aa785c5,1f3893e..ec505e4
--- 1/btif/src/btif_dm.c
--- 2/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@@ -63,8 -54,7 +63,9 @@@
  #include "include/stack_config.h"
  #include "osi/include/log.h"
  #include "osi/include/allocator.h"
 +#include "osi/include/log.h"
 +#include "stack_config.h"
+ #include "stack/btm/btm_int.h"
  
  /******************************************************************************
  **  Constants & Macros

diff --cc btif/src/btif_storage.c
Simple merge

diff --cc stack/btm/btm_dev.c
Simple merge