[automerger skipped] DO NOT MERGE am: d35a9ac7 am: c7c764fd -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: I454fbe4b702b7fc43b904705e434bcf472f99f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>