[automerger skipped] Merge changes I0766618b,I58c19cf9,I5821d922,I2400e404...

[automerger skipped] Merge changes I0766618b,I58c19cf9,I5821d922,I2400e404 into tm-qpr-dev am: 3c30e625 -s ours am: ae44772f -s ours

am skip reason: Merged-In I0766618bee072d4f058633b5016dc69386e2724e with SHA-1 fb806f0e is already in history

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



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