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