[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: c29e70e2 am: b73c8e7f -s ours am: 93738e71 -s ours

am skip reason: Change-Id Iac492777e490713bb8f2c3dd88a5de23dd6f613e with SHA-1 beb36a58 is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1487069

Change-Id: I0b6858464517326b98f7f9330d354221794ce810