[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L34400000957865249:N12900001322982133" into tm-qpr-dev am: 97cec323 -s ours am: 0e0762ad -s ours

am skip reason: Merged-In If7dbec8efa4126a60df7e5afe1c74f8e281ed971 with SHA-1 9d2ba2b2 is already in history

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



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