Merge "[sf] add CtsSurfaceControlTests and FrameRateOverrideTest to SF presubmit" into main