[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: bca4221d -s ours am: 644c78e2 -s ours am: ec64ea09 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I62aab19fd5456e17c0e765c5ca252d90ef28f8e0