[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: c481777e am: 195767f4 -s ours am: 01340b56 -s ours am: ac52d0d4 -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