[automerger skipped] Merge "Merge Android 12 QPR 3" am: b466322a -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: I498c52d84eac7920e21bb2b00bf35fd7bffe5113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>