DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d
am: d721694b79

Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be