[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 752486ffbb am: a7be15ad74 -s ours am: b320b9c62a -s ours am: 8cc93f4798 -s ours

am skip reason: Change-Id I14e0e50b35f05889da56a5ffa35907c744debd26 with SHA-1 7bb9186280 is in history

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

Change-Id: I88c0cf5fd32bfbec52d68f778362c74dd0f29ac3