[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: fbeeb204 -s ours am: c4277caa -s ours am: 67fa782d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I44cfeb20695e1a1f2d8823a3236a5ea3fb17095e