DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master

Bug: 130175407
Change-Id: I9729a1b9eaa1a86152fca409da33cf641e947043

diff --cc btif/src/btif_dm.cc
Simple merge

diff --cc stack/btm/ble_advertiser_hci_interface.cc
index baf70b5,574ef71..dddf8d4
--- 1/stack/btm/ble_advertiser_hci_interface.cc
--- 2/stack/btm/ble_advertiser_hci_interface.cc
+++ b/stack/btm/ble_advertiser_hci_interface.cc
@@@ -22,15 -27,8 +22,16 @@@
  #include "btm_int_types.h"
  #include "device/include/controller.h"
  #include "hcidefs.h"
+ #include "log/log.h"
  
 +#include <queue>
 +#include <utility>
 +
 +#include <base/bind.h>
 +#include <base/callback.h>
 +#include <base/location.h>
 +#include <base/logging.h>
 +
  #define BTM_BLE_MULTI_ADV_SET_RANDOM_ADDR_LEN 8
  #define BTM_BLE_MULTI_ADV_ENB_LEN 3
  #define BTM_BLE_MULTI_ADV_SET_PARAM_LEN 24

diff --cc stack/btm/btm_ble.cc
Simple merge

diff --cc stack/l2cap/l2c_utils.cc
Simple merge