DO NOT MERGE am: 635e2feeb8

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

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