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