[automerger skipped] Merge changes...

[automerger skipped] Merge changes I8785e725,I44d5d114,I26f4b725,Ib717faa5,I45adfe7c, ... into tm-qpr-dev am: 6e15b6ab -s ours

am skip reason: Merged-In I8785e725dad51e263483efd8b91cd4ad4cbfb06b with SHA-1 efc60ce3 is already in history

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



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