DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours am: 19fa568b39
am: 2bf724509c
am: a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
This commit is contained in: