[automerger skipped] DO NOT MERGE am: f8659b6921 -s ours

am skip reason: contains skip directive

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

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