Merge "Move CtsSurfaceControlTestsStaging to presubmit" into main