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