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
am: 1c91c0c801  -s ours

Change-Id: Ia80f31671b6416a233a9441df95a8eca00ef4806