Merge "Synchronize MediaPreparer file download/extraction" into oreo-cts-dev am: 164c96da82 am: 4ec9fa499e
am: d25f2f0add  -s ours

Change-Id: Iab66eabfcac2f2d0ae8c17b4bdc79aaee7ff383c