[automerger skipped] DO NOT MERGE am: 635e2feeb8 am: 2f9aea1099 -s ours

am skip reason: contains skip directive

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

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