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

Change-Id: I30d429f22c5248850c3ebc81f3d3453cc52d684a