Merge "Remove fake package name from MediaOutputControllerTest" into main