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