[automerger skipped] Merge "Merge Android 12 QPR 3" am: b466322a -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR 3" am: b466322a -s ours am: 165cd6a9 -s ours am: 4eb85fc4 -s ours am: b8467bf5 -s ours am: 54d3dfc1 -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: Ida8b009e40922dedcac8ddf095a6d54571596964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>