Merge "Add CtsSurfaceControlTestsStaging to SF presubmit" into main