[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: b627908c -s ours am: 2914c1d9 -s ours

am skip reason: Merged-In I9d830177e0569cc1e9bbc4bb8458069d3b2d23ae with SHA-1 a92bb3cd is already in history

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

Change-Id: I0cefc1b7f92bd27988996cd3306736c39a22122e