DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97  -s ours am: 45fc104958  -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23  -s ours
am: 07c4c8efed

Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f