DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346
am: 46bc2bd7bd
-s ours am: b410435a21
am: de7c312543
Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
This commit is contained in: