[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 35298bd421 am: 4c5cc1e1e6 -s ours am: 6ca8e36128 -s ours am: 5ede07b8d0 -s ours am: 4bf4008d74 -s ours

am skip reason: Change-Id I43fee240a64460056cb0b575504dba0895806dd2 with SHA-1 b0da44e0e7 is in history

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

Change-Id: Ic9c0245a60fdcac676fb9ba1ad2eba1fc0af83ae