[automerger skipped] DO NOT MERGE am: 2d01df99 -s ours am: f2fcc33d am:...

[automerger skipped] DO NOT MERGE am: 2d01df99 -s ours am: f2fcc33d am: 257cbf3f -s ours am: ec102934 am: 135ef25b -s ours am: 7a678325 am: 83bef2d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51aff79fc851f7e72ecc2e9969aa4b57b7c7ca1f