[automerger skipped] Merge changes...

[automerger skipped] Merge changes Idef1fe5e,I79233c7a,Idfcc87ce,I32394168,I1e91469f, ... into tm-qpr-dev am: 5e5871fd -s ours am: 2e7df0c8 -s ours

am skip reason: Merged-In Idef1fe5e6c50d42c1a65281e02cfcfd7db2cdad3 with SHA-1 dec51835 is already in history

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



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