[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7d5a330dd3 -s ours

am skip reason: Change-Id If560b4abba6e77df6c5b46e07c1d3a13ca422196 with SHA-1 d581ed23fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief627193431988e917ad9b32731fbf0bd6db4085