[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: ac52d0d4 -s ours am: d827f415 -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: Id90313912a548b12362bcdb57faeb29669551b25