DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa  -s ours
am: 70387afef9

Change-Id: Id60f3d902a5a2710310613ea0d12796ea46af931