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

am skip reason: Change-Id I990dc6ba5b4a34dbbe1da5fe90422bfc10249c84 with SHA-1 1e414ec7 is in history

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

Change-Id: Ia0c981b734d1b8fdb3b973e8ea4fad378f5a1cdf