[automerger skipped] Merge "Merge Android 12" am: 022d83e4 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 022d83e4 -s ours am: 4dfa7e8c -s ours am: c7ff0be3 -s ours am: 89a1c47e -s ours

am skip reason: Merged-In I783a9d61d250f7ba13ad362d6d21387f7ffe0045 with SHA-1 409bdb17 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1847478

Change-Id: I6c1b4fd49c6103980b0bcaa88c6c5e71d8e44b56