[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 35298bd421 am: 4c5cc1e1e6 -s ours am: 6ca8e36128 -s ours am: 5ede07b8d0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iff0e0ffaa4fcc2961174dc775e1711457dcfbe31