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

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



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