[automerger skipped] Merge Android 12 QPR 3 am: 0f251848 -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 0f251848 -s ours am: 7861bc2c -s ours am: e449b5d5 -s ours am: b242c334 -s ours am: 527cff8b -s ours

am skip reason: Merged-In I63881218bf36ebb256daeecc174c082c4cd7ed24 with SHA-1 3091f136 is already in history

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



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