Merge "Add CtsSurfaceControlTestsStaging to SF postsubmit" into main