[automerger skipped] DO NOT MERGE am: 46ab5f5c7e am: f679e0b88a -s ours am: 36d6179d01 -s ours

am skip reason: contains skip directive

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

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