[automerger skipped] DO NOT MERGE am: 256ef21f54 am: 15a3018ba2 -s ours am: 05faf0ce59 -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: Iad83492c1b855e987dd3e235710ecf720f7f10d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>