Merge "Revert^2 "Move StagedRollbackTest from postsubmit to presubmit"" into main