Merge cherrypicks of [18779981] into tm-release. am: 3f4456d1b2

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

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