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
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
This commit is contained in: