DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346  -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315  -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8  -s ours
am: a829548c12

Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69