Merge "Revert "Un-@Ignore 7 passing ChooserActivity tests.""