DO NOT MERGE am: 61751398dc

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

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