Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394