[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: e53652d8 -s ours am: 1e414ec7 -s ours am: 08b6a1f1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I02eb464902807446dc36867598a3d0d2ff03a8a3