[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 skip reason: Change-Id Iabe3b5a543b465b8e508c61dbba65286b9f68d2c with SHA-1 66f1fabe is in history

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

Change-Id: I0ff9ff4992dc17879d3cc67ebf3113bee47c1cf9