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