DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003  -s ours am: 47bc5fba05 am: 4d61a1bd15
am: 09112f231c

Change-Id: I816186e9a1e6719c88b7121a65071b8dc29981b2