DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346

Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d