[automerger skipped] DO NOT MERGE am: 635e2feeb8 am: 53cf8cb57c -s ours am: 6233017900 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/27630561

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