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

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

Change-Id: I81cb3c2f08f9dfa99d9be7ca76f9dbea10b6bea0
Signed-off-by: Automerger Merge Worker <[email protected]>