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
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
This commit is contained in: