DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346
-s ours am: 5b2a431787
am: 9ba609cef9
am: c1ebc09ff0
am: fad1e6a315
-s ours
am: 416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
This commit is contained in: