[automerger skipped] Merge changes Idd648186,I7a607d3d,I5c14c5ac into...

[automerger skipped] Merge changes Idd648186,I7a607d3d,I5c14c5ac into tm-qpr-dev am: 7b5ad10d -s ours

am skip reason: Merged-In Idd648186dd02334835a3c5883bfd7859224859d8 with SHA-1 180cd101 is already in history

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



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