DO NOT MERGE am: 256ef21f54

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

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