[automerger skipped] Merge "Merge Android R" am: 5e215e6d -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 5e215e6d -s ours am: 9b893799 -s ours am: 31d982b1 -s ours

am skip reason: Change-Id I92b87de2157472c31da9d232e31196a9117d3531 with SHA-1 11972f94 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1421953

Change-Id: I9fa10b095880c69c4534c89a473794f111073fce