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

Change-Id: Icc827672d37662817ccf7e0e2be21c685f96bc79