Merge mainline-release 6664920 to master - DO NOT MERGE am: e05e1a6609

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

Change-Id: Iae1ae02ed30c970d10034bdd1f0affedd2b6047c