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

am skip reason: subject contains skip directive

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

Change-Id: I414b958f277f6a51de1a1319ff3ca7442193b6e8