[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 4691aede -s ours am: fa0ec8c8 -s ours

am skip reason: Change-Id I4e364173bdde32cf3fd1351f9f6a6d75adf41bac with SHA-1 74dbe471 is in history

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

Change-Id: I5c69e46d5813f7e406fab29c286d943900db3d86