[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2a23a71d6a -s ours

am skip reason: Merged-In I15af8dd9393974c5e397db2daede9e98a0b89ba4 with SHA-1 de3b7b7f4b is already in history

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

Change-Id: I0815cd07bbe288699779a7fd441e1d5eed2ed7bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>