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

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

Change-Id: If96bb6471ded7d7ecc1b3a57e2da72ede393f5a7