DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
am: 979efb53d0

Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c