[automerger skipped] DO NOT MERGE am: dd0a8f8c am: 308f9096 -s ours am:...

[automerger skipped] DO NOT MERGE am: dd0a8f8c am: 308f9096 -s ours am: 7c318d78 am: d418d196 -s ours am: 60632054 am: b8888d82 -s ours am: d77e1667 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2f0705b0df20a894811dc21e04c2b7a0dbcbfefb