DO NOT MERGE am: d80cf1a7b7

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

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