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
am: d88820f3f6
am: 629553fb49
am: 397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
This commit is contained in: