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

Change-Id: Ifeffebaae3402a18fc1eb4883f46f7827e2b23df