Merge "Demoting testUninstallFromWorkspace, which is a 4% presubmit blocker" into main