[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from...

[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into udc-dev-plus-aosp am: 51087e6c am: 43a9810b -s ours

am skip reason: Merged-In I81d512e9b21b64a2cca0450cb85c52d8a2125865 with SHA-1 a75567ae is already in history

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



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