Merge "Revert "Move snapuserd_test to presubmit-large group"" into main