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