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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ebb8e2ff3199464af208c643cfcefe1fa7b1f34