[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: abc32dfb -s ours am: de293ed0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I22c5f705c771961456b0a5ca5df4f7c4d4dafc1c