Merge "Synchronize MediaPreparer file download/extraction" into oreo-cts-dev
am: 164c96da82

Change-Id: I54ff529985b95c25e32372c9dd724fe7b110a5d9