Merge "Remove duplicate MediaRouter2 related tests"