Merge "Add AppDataRollbackHelperTest to RollbackManager presubmit"