Merge "Add default_teams to CtsSurfaceControlTests build target" into main