[automerger skipped] DO NOT MERGE am: f8659b6921 -s ours am: 94e7cb506b -s ours am: 7943948856 -s ours am: 39ca42bb50 -s ours am: 5cbc5876b8 -s ours am: 5adf11ff0b -s ours

am skip reason: contains skip directive

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

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