[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: bea976d4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I11ad2ac8634cbb4f72302b28acc09034dca0cb8c