DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab
am: 95bbef26d7
am: ba66bb8a43
-s ours am: 004f90f35e
am: 86cc9a681d
am: d721694b79
am: 2433b6dc44
am: e803004863
-s ours
am: 952ae3ec34
Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
This commit is contained in: