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

Change-Id: I91421c6629af2131e7aaeadac048c92da9653212