[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e05e1a6609 am: cdb41fc7ed -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: Iae6fd9d49fe6ca5be815e881a26a2691afa4b62d