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

am skip reason: subject contains skip directive

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

Change-Id: I6a683c01a891c2f56403a6aa7309e0ee03ac3782