[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0306e0cf -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0306e0cf -s ours am: ccdb2030 -s ours am: 6a848808 -s ours

am skip reason: Merged-In I59d904735285af6ce9ca6c5ca00cb28e2a873699 with SHA-1 7a78e38e is already in history

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



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