DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours am: 70387afef9
am: 9173362f4e
am: cf1c0b1f58
Change-Id: I502a85737c41f79068e2a2d7417cce8e52957794
This commit is contained in: