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

Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc