Merge "[Pandora] Fix slow reconnect_phone" am: 94c31350 am: 6986d8bd am:...

Merge "[Pandora] Fix slow reconnect_phone" am: 94c31350 am: 6986d8bd am: ab516efc am: 7a8d3f6e am: 926d7bc4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2237473



Change-Id: I0108229213503727bad64765bc19a147ae796ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>