[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: 5ee89bac -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: Ie1a944abdb2c7ffce8c437caf9c0f2bcc26e21bd