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

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

Change-Id: I80c32b5fe5ca1bb6376c7d61ae591844f9be607c