[automerger skipped] DO NOT MERGE am: 1996daaf -s ours am: e4055b88 -s...

[automerger skipped] DO NOT MERGE am: 1996daaf -s ours am: e4055b88 -s ours am: 5a0a3d09 am: f6c9fa90 -s ours am: 5e3a3e24 am: af728372 -s ours am: 945790c3

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

Change-Id: I26e00675086adef81ce0e3637397a5b74e23e2bf