[automerger skipped] Merge Android 12L am: 1b211979 -s ours am: 324bf030...

[automerger skipped] Merge Android 12L am: 1b211979 -s ours am: 324bf030 -s ours am: d0ad8ec2 -s ours am: e67f0113 -s ours

am skip reason: Merged-In I49488125506e6087a7b8e20152daafb116340291 with SHA-1 67c8895e is already in history

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

Change-Id: I194088fccd9b6eeeac9e7bf6a2d3be8031ef2466