DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master

Bug: 136196576
Change-Id: I0b01b2d05243625f3c4ae1b3326bae88ea6a9f36

diff --cc btif/Android.bp
index 1f781c9,c375bf0..814cba7
--- 1/btif/Android.bp
--- 2/btif/Android.bp
+++ b/btif/Android.bp
@@@ -136,9 -126,16 +136,16 @@@ cc_test 
          "liblog",
          "libprotobuf-cpp-lite",
          "libcutils",
 +        "libprocessgroup",
          "libutils",
          "libcrypto",
 -        "libstatslog",
+         "android.hardware.keymaster@4.0",
+         "android.hardware.keymaster@3.0",
+         "libkeymaster4support",
+         "libkeystore_aidl",
+         "libkeystore_binder",
+         "libkeystore_parcelables",
+         "libbinder",
      ],
      static_libs: [
          "libbt-bta",

diff --cc main/Android.bp
index f90d89d,2213c52..3efd993
--- 1/main/Android.bp
--- 2/main/Android.bp
+++ b/main/Android.bp
@@@ -54,6 -52,13 +54,12 @@@ cc_library_shared 
          "libtinyxml2",
          "libz",
          "libcrypto",
 -        "libstatslog",
+         "android.hardware.keymaster@4.0",
+         "android.hardware.keymaster@3.0",
+         "libkeymaster4support",
+         "libkeystore_aidl",
+         "libkeystore_binder",
+         "libkeystore_parcelables",
      ],
      static_libs: [
          "libbt-sbc-decoder",

diff --cc osi/src/alarm.cc
index ea075db,07d8704..30e4ed8
--- 1/osi/src/alarm.cc
--- 2/osi/src/alarm.cc
+++ b/osi/src/alarm.cc
@@@ -91,11 -92,11 +91,11 @@@ struct alarm_t 
    // potentially long-running callback is executing. |alarm_cancel| uses this
    // mutex to provide a guarantee to its caller that the callback will not be
    // in progress when it returns.
-   std::recursive_mutex* callback_mutex;
+   std::shared_ptr<std::recursive_mutex> callback_mutex;
 -  period_ms_t creation_time;
 -  period_ms_t period;
 -  period_ms_t deadline;
 -  period_ms_t prev_deadline;  // Previous deadline - used for accounting of
 +  uint64_t creation_time_ms;
 +  uint64_t period_ms;
 +  uint64_t deadline_ms;
 +  uint64_t prev_deadline_ms;  // Previous deadline - used for accounting of
                                // periodic timers
    bool is_periodic;
    fixed_queue_t* queue;  // The processing queue to add this alarm to

diff --cc osi/test/alarm_test.cc
Simple merge

diff --cc stack/sdp/sdp_db.cc
Simple merge

diff --cc stack/sdp/sdp_discovery.cc
index 29377b0,f2e9805..e7fe979
--- 1/stack/sdp/sdp_discovery.cc
--- 2/stack/sdp/sdp_discovery.cc
+++ b/stack/sdp/sdp_discovery.cc
@@@ -336,8 -349,20 +336,9 @@@ static void sdp_copy_raw_data(tCONN_CB
    unsigned int cpy_len, rem_len;
    uint32_t list_len;
    uint8_t* p;
+   uint8_t* p_end;
    uint8_t type;
  
 -#if (SDP_DEBUG_RAW == TRUE)
 -  uint8_t num_array[SDP_MAX_LIST_BYTE_COUNT];
 -  uint32_t i;
 -
 -  for (i = 0; i < p_ccb->list_len; i++) {
 -    snprintf((char*)&num_array[i * 2], sizeof(num_array) - i * 2, "%02X",
 -             (uint8_t)(p_ccb->rsp_list[i]));
 -  }
 -  SDP_TRACE_WARNING("result :%s", num_array);
 -#endif
 -
    if (p_ccb->p_db->raw_data) {
      cpy_len = p_ccb->p_db->raw_size - p_ccb->p_db->raw_used;
      list_len = p_ccb->list_len;

diff --cc stack/sdp/sdp_utils.cc
Simple merge

diff --cc stack/sdp/sdpint.h
Simple merge