Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into udc-dev-plus-aosp