DO NOT MERGE - Merge ab/7272582 am: d8451392ef am: 0d7a62d4af

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

Change-Id: Id2403ae80e4bd520718cf9bc96ebb84dd710651d