[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: d3cbe096 am: 99778b7d -s ours am: e2a47e7c -s ours am: 05b7fff3 -s ours am: 2c3b0500 -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: Id90313912a548b12362bcdb57faeb29669551b25