[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to...

[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 2d840cb1 -s ours am: 434d2717 -s ours am: cb756f42 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/12984816

Change-Id: I3a79ff50a6b70b720738b2f066fc964dd1a7bb10