[automerger skipped] DO NOT MERGE am: d35a9ac7 am: ae2e7676 am: 6a73b22f...

[automerger skipped] DO NOT MERGE am: d35a9ac7 am: ae2e7676 am: 6a73b22f am: 922ad207 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I18472236c007ec55e9a2c534123bc53655f53298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>