Merge cherrypicks of [19734446] into tm-release. am: 31afac709f

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

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