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

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



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