[automerger skipped] Merge changes I03522897,I938467ca,Ia5871919 into tm-dev...

[automerger skipped] Merge changes I03522897,I938467ca,Ia5871919 into tm-dev am: b2e32466 am: 0c5805fc am: 21551b49 am: dfda4112 -s ours

am skip reason: skipped by user begizi

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



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