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

am skip reason: Change-Id Iabe3b5a543b465b8e508c61dbba65286b9f68d2c with SHA-1 66f1fabe47 is in history

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

Change-Id: I2c5276164c5e23eeb07b211a176e33598611210e