DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0  -s ours
am: 0f53a56cbd

Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883