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



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