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

Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965