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

* changes:
  [automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into main am: 6a63d356f5 -s ours am: 183fd9d444 -s ours am: 1d0370e48b -s ours
  [automerger skipped] Cherry-pick MediaFrameworkTest dep changes from internal main am: 70b59724f3 -s ours am: 8607299669 -s ours am: d8f07ed622 -s ours