[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: 3d39df1a -s ours am: ed217a98 -s ours am: 7b909ca8

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

Change-Id: I47bb98f7a18e092806ad8f2789acec0c99d7346d