[automerger skipped] Merge "Merge Android R" am: a9f7e8d675 -s ours

am skip reason: Change-Id Ia5b583d0d3196a63cbefc54597783416d64832e0 with SHA-1 fce67a753a is in history

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

Change-Id: Iaa8731fed502863aaa3e96f5d075b17dab96cb68