Merge changes I3dac549c,I7ff35d5e am: f34b57a055

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

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