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

am skip reason: Change-Id I6d7f94fdb0a7d123d7c9ef80276cb6f9efa81977 with SHA-1 8e5eaf5439 is in history

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

Change-Id: I43fee240a64460056cb0b575504dba0895806dd2