[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ae17c44084 -s ours

am skip reason: Change-Id Iff83a1e4a1202b11c4c2d5634532462f08c67bfb with SHA-1 13cb194b03 is in history

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

Change-Id: Ib9e0c37c0b1ba3455d008f852558d17c75ec2662