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

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

Change-Id: Idb6937c9d9b333905b23a8fa6ae359aca91cd89d