[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 40f259be am: 69e9c1a3 -s ours

am skip reason: Merged-In I592c0a9c0e77869999357611aa99f3d9bc53b8b6 with SHA-1 2414e12c is already in history

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

Change-Id: I7e890f0292d0e822fb318c08ee975a7802f42d9f