Merge cherrypicks of [20055816] into sc-v2-platform-release. am: 93d267a43e

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

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