[automerger skipped] Merge "Merge Android 12 QPR1" am: 7efccf61 -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: 7efccf61 -s ours am: bfa45e0d -s ours am: 5d67492a -s ours

am skip reason: Merged-In I2ea68b79a6972dcca45a39f3f678fcfd2374ef81 with SHA-1 adad2481 is already in history

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

Change-Id: I6fa874b62eb8fe0077f1f3a681f0d972ef514e7e