Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into...

Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into udc-dev-plus-aosp am: 51087e6c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25235175



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