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

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



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