Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: cdb2b25241

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

Change-Id: Id7a87c05e0fedfe70e8b74eb8179881d5895f535