[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 skip reason: subject contains skip directive

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

Change-Id: Ieb1e17380b77caa469d8b0b5813c14cbc0f6a057