Merge "Convert Media unit tests from push-file to MediaPreparer" am:...

Merge "Convert Media unit tests from push-file to MediaPreparer" am: 8cfff52b am: a1edd686 am: d5c7b927 am: c4eedb74 am: 26ceb981 am: 601a2521

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2587546



Change-Id: Id46494a3b47154718e2fb497f8905d3b4983baa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>