[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 3cc439cdf6 -s ours

am skip reason: Change-Id I536e81dc9e883310ad96dbf40f986265d69e5438 with SHA-1 cd2c02bd0d is in history

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

Change-Id: I14e0e50b35f05889da56a5ffa35907c744debd26