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