[automerger skipped] Merge "Merge Android R" am: 7c97cc5eb0 -s ours am: c3d0aa5d14 -s ours

am skip reason: Change-Id I5fcf38b16c81c6b75624936a4f98e37bdb871340 with SHA-1 a2c57f54f5 is in history

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

Change-Id: I74816f770f72105c7e93ff44c0690c68db79ae90