Merge changes Ibe252136,I33838da7,I22550eca am: 80128e26 am: ed59b1a8 am: bfacd49a

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



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