[automerger skipped] DO NOT MERGE am: 256ef21f54 am: 15a3018ba2 -s ours

am skip reason: subject contains skip directive

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

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