DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97  -s ours am: 45fc104958  -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23  -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547  -s ours am: a00521b3a0 am: 16776b64c8 am: 1dcb8522fa
am: 937ede14d8  -s ours

Change-Id: I8c23627db5650e7547b79a38d91754aa7cd67418