[automerger skipped] DO NOT MERGE am: 46ab5f5c7e am: 7ca79694cd -s ours am: 9d2e260834 -s ours am: 6b8ba90f11 -s ours am: 24d16ded64 -s ours

am skip reason: contains skip directive

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

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