Merge changes Ia60c7255,I5d111686 am: 6c8ad601 am: 41f8372c am: d9bb2722 am: 005770aa am: c0b94efa

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



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