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

Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30