Merge "Merge "Synchronize MediaPreparer file download/extraction" into oreo-cts-dev am: 164c96da82" into oreo-mr1-cts-dev am: 3844a51f92
am: af21fa51ce  -s ours

Change-Id: I09e45f94ab4e14453a849cefbad0fce7452323e4