DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb
am: 45926efd0f
-s ours
am: 89791cb5c3
Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
This commit is contained in: