[automerger skipped] DO NOT MERGE am: 2d01df99 -s ours am: f2fcc33d am:...

[automerger skipped] DO NOT MERGE am: 2d01df99 -s ours am: f2fcc33d am: 257cbf3f -s ours am: ec102934 am: 135ef25b -s ours am: 7a678325

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

Change-Id: I1be6d9bb0b065455abeb80f2e447aca098696726