[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: e0521056 am: 2b8c06c3 -s ours am: 1fddf420 -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: I968d7eb92c6ea6119ded8a050567de79afdb61ec