[automerger skipped] Merge changes...

[automerger skipped] Merge changes Ib97a515e,I69c866b0,I9110bf52,I5ada8642,I0042d9c9 into tm-qpr-dev am: 4ba175bf -s ours

am skip reason: Merged-In Ib97a515ece0c292298401503631b8395797f6383 with SHA-1 799b87bb is already in history

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



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