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

[automerger skipped] Cherry-pick MediaFrameworkTest dep changes from internal main am: 70b59724 -s ours am: 86072996 -s ours am: d8f07ed6 -s ours

am skip reason: Merged-In I7e29732e1e77e37cfb491521d14d2f3eb07deb36 with SHA-1 bbe98fe3 is already in history

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



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