Merge "DO NOT MERGE - Merge ab/7272582" am: 4c2d8f4428 am: 40b358dcea

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

Change-Id: I4808be8e00f5cdf81f3eb58abb6b8f9bb28b3388