Merge "Synchronize MediaPreparer host download, attempt 2" into oreo-cts-dev
am: e733ba31d4

Change-Id: If507f389e1cf3268950bff5d12f44562d329faed