[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: cdb2b25241 am: ed04220671 -s ours am: e7d0fd23d2 -s ours am: ca73e3eb8c -s ours am: 5051e8da61 -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: If259463f5071bb8ebc518f7686dde01085446ad2