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