Merge changes I03522897,I938467ca,Ia5871919 into tm-dev am: b2e32466 am:...

Merge changes I03522897,I938467ca,Ia5871919 into tm-dev am: b2e32466 am: 0c5805fc am: 21551b49

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



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