[automerger skipped] DO NOT MERGE am: f8659b6921 -s ours am: 94e7cb506b -s ours am: 369ef55faf -s ours am: 6100b1a639 -s ours

am skip reason: contains skip directive

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

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