DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab
am: 95bbef26d7
am: ba66bb8a43
-s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
This commit is contained in: