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

[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 4efee13d -s ours am: 60cedb88 -s ours

am skip reason: Merged-In I82e8807a7d9a38a346bd799e9834f117d339b7c5 with SHA-1 ab3ce181 is already in history

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

Change-Id: Idf731b3b3aa8c19b99fec9c8d282fa9ca20da400