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

am skip reason: subject contains skip directive

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

Change-Id: I82524849226e940c6aac179b4d4cedb68f047837