Merge changes from topic "am-8b264a904f9f46f19bd1b12690de5665" into main

* changes:
  [automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into main am: 6a63d356 -s ours am: 183fd9d4 -s ours am: 1d0370e4 -s ours
  [automerger skipped] Cherry-pick MediaFrameworkTest dep changes from internal main am: 70b59724 -s ours am: 86072996 -s ours am: d8f07ed6 -s ours