DO NOT MERGE - Merge ab/7272582 am: d8451392ef

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

Change-Id: Idead428447c6531e6be865984ac21a67839a562c