[automerger skipped] DO NOT MERGE am: 61751398dc am: b686e5e07e -s ours

am skip reason: subject contains skip directive

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

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