Merge changes Ibe771914,I5778d588 am: b2f3d4ba am: 0ef8896e am: bac4a753 am: ee8f195e

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



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