[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 -s ours am: 8239bd3b

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

Change-Id: If6fab8f41a98148ce5c768c07ee1f5e9f7748710