Merge "Revert "Moving CrashRecoveryModuleTests to presubmits"" into main