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