[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: 9c447ef4 -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: Iacf49199f40df62362352fbd0366064720ebe2b0