DO NOT MERGE am: 46ab5f5c7e

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

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