[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: d624b919 am: 15e8c53b -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: I158a596180c8027e446a9e3cd082ea8443ff6940