Merge cherrypicks of ['googleplex-android-review.googlesource.com/23845447'] into udc-release. am: a1e5ac7164

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/23883952

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