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