Merge changes from topic "b/226693442" am: a194e0b5 am: ac286ae2 am:...

Merge changes from topic "b/226693442" am: a194e0b5 am: ac286ae2 am: b699d9cb am: 244ce925 am: 81f79495

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



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