Merge changes I9b4328e9,Iff2ea989,I8108b84d am: a7966cef am: 50fd7d6b am:...

Merge changes I9b4328e9,Iff2ea989,I8108b84d am: a7966cef am: 50fd7d6b am: 1ee09fba am: 3e5f40f3 am: ff44f114

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



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