[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: 4aa9a871 -s ours am: 72bed452 am: 803a1536 -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: I894e9401da5286ffbe3a1d144879ed3a5b96c412