[automerger skipped] Merge Android U (ab/10368041) am: 1a80f161 -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 1a80f161 -s ours am: d09a13e3 -s ours am: f3834ecf -s ours am: 1961db10 -s ours

am skip reason: Merged-In Ibff022e707998c9d2574814323407bb6953590f6 with SHA-1 ad7e184e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/downloader/+/24182770



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