[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT...

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 4f7fa231 am: b48f5a4e -s ours am: f5573283 -s ours am: 611f4bba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I03f293d1b763a64d031c3dbf09944a17badbf1a9