[automerger skipped] Merge "Synchronize MediaPreparer host download, attempt 2" into oreo-cts-dev am: e733ba31d4 am: b85f97eb00 am: 6807446c20
am: 8f7af2ef5d  -s ours

Change-Id: Ic0f1f47726c92aa59a33ff781c4e2cf3714b3080