Merge changes If47a6350,Ib795d8d8 am: 2d58918e am: eb38a571 am: ada957e4...

Merge changes If47a6350,Ib795d8d8 am: 2d58918e am: eb38a571 am: ada957e4 am: 15a8e39b am: c185af44 am: 012f2b33

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



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