[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 skip reason: subject contains skip directive

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

Change-Id: Ic45c7c273b911006b39d47137a161e0f1e46c2b1