Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: d3cbe096e5

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

Change-Id: I0158134b59f4513f88801d24765496697e05c0cd