Merge changes from topic "pandora" am: f6fec469 am: 4dda5f9e am:...

Merge changes from topic "pandora" am: f6fec469 am: 4dda5f9e am: 51a1ec54 am: 94f6d0c2 am: c64fb6cb

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



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