[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master -...

[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 skip reason: Change-Id I990dc6ba5b4a34dbbe1da5fe90422bfc10249c84 with SHA-1 c55a61f6 is in history

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

Change-Id: I02d608e2bf327a757455fac02c27d283990bca5d