[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: d3cbe096 am: 99778b7d -s ours am: e2a47e7c -s ours am: 05b7fff3 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1486373

Change-Id: Ibae8fa76a92e268a70b1ea9a8d7007446b7483e8