[automerger skipped] Merge changes I771efe95,I0a86e885,If0bb8317 into...

[automerger skipped] Merge changes I771efe95,I0a86e885,If0bb8317 into tm-qpr-dev am: 2c66b366 -s ours

am skip reason: Merged-In I771efe95d30fdf97939d05e9e6d724cdb675b7f7 with SHA-1 68215ef0 is already in history

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



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