[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a6fa6c7a79 -s ours am: 4f653d3f0e -s ours am: 6013ddb721 -s ours am: 2543da10c2 -s ours

am skip reason: Change-Id I180ec2811830c58219308ec39a7426c2e4062324 with SHA-1 db7f99a8fe is in history

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

Change-Id: Iedfbbe3bc8119b3e9cd6694e5863091ce63859c9