[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: e3f85be9 -s ours

am skip reason: Change-Id I0ff9ff4992dc17879d3cc67ebf3113bee47c1cf9 with SHA-1 434d2717 is in history

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

Change-Id: I0ae26ad965782d3cfa4f3440608d24040a4109ea