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

Change-Id: I2eb18e0ad264898662f921ba3cf582a2875bdad4