DO NOT MERGE am: 46ab5f5c7e

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

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