[automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE am: 45b427404f -s ours am: b0da44e0e7 -s ours am: 705a0a499f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibfab9c3312b84151f92b87f69ec66ce45f65a269