[automerger skipped] DO NOT MERGE am: d35a9ac7 am: ae2e7676 am: 18702f50...

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