DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
am: efe9e7e003  -s ours

Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f