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

[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into aosp-main-future am: aae44639 -s ours am: f78e26ed -s ours

am skip reason: Merged-In I8cb92fd35b3633cf458f8692173124fd1666d6b5 with SHA-1 54342761 is already in history

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



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