[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 1ac82e5c -s ours am: d25ac9a5 -s ours

am skip reason: Merged-In I9da612947a9b6efdaf8e31f83f84075368352aa1 with SHA-1 6f3e80dd is already in history

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

Change-Id: Ib4572eba04bff35c233448c8a42bec8f47212b7d