DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e