Merge cherrypicks of [20055816] into tm-qpr1-release. am: 9296e6acf0

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

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