DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97  -s ours
am: 45fc104958  -s ours

Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb