[automerger skipped] DO NOT MERGE am: 59052739d8 -s ours am: 5eb37930d9 -s ours am: 8bf529d342 -s ours am: 64852545b3 -s ours am: 85a025e3ff -s ours

am skip reason: contains skip directive

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

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