Merge "Changes to support unbundled ChooserActivityTest"