DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd  -s ours am: b410435a21 am: de7c312543 am: c1574a1ef8
am: c2198532bf  -s ours

Change-Id: I1df2f438a20e129ed5d1237b85557fe2d9fd5295