[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: cf2243d4 am: b598b283 -s ours am: b1832273 -s ours am: 4e827037 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f08eda51678bda88a9dd83076f3f307c4113e88