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

[automerger skipped] Merge changes I03522897,I938467ca,Ia5871919 into tm-dev am: b2e32466 am: b89cb6bb am: eecf84df -s ours am: f2fdde2b -s ours

am skip reason: Merged-In I03522897e93af59508efa2f536dd217d48f78110 with SHA-1 8ecede4b is already in history

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



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