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

[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 98b8cacd -s ours

am skip reason: Merged-In Id62f117f27fcd816b2461406f4606de0415e93a8 with SHA-1 0c856206 is already in history

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

Change-Id: I6a62f1a015b6c37da7108de387ea3eb1d7c41e5f