Merge cherrypicks of ['googleplex-android-review.googlesource.com/24151559'] into udc-release. am: 30ca8fa428

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

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