[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: efab59e0 -s ours am: d4de2c97 am: 29a2d228 -s ours am: 79d37bb4 -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: I7e3465444d72c8999dda84773306d38888c2c7eb