[automerger skipped] Merge changes...

[automerger skipped] Merge changes I553daab5,I4f467864,I6f9deb17,Ic23977b5,I32dca835, ... into tm-qpr-dev am: ebd52853 -s ours

am skip reason: Merged-In I553daab5f2ff978355a9968534ae5dd4fb34de54 with SHA-1 10466cc0 is already in history

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



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