DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 8441943bfa  -s ours

Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3