DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97
-s ours am: 45fc104958
-s ours
am: 19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
This commit is contained in: