DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
am: 250d5e60b0  -s ours

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6