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

am skip reason: subject contains skip directive

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

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