DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
This commit is contained in: