DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb
am: 45926efd0f
-s ours am: 89791cb5c3
am: b3d4bc8239
am: 53a69985b3
am: 3aa36a6afb
am: 250d5e60b0
-s ours am: 0f53a56cbd
am: 9138455b41
am: dcd1c0dde1
am: 5477a61da6
-s ours
Change-Id: Icfc98fefed776f7eea3180ae85fb60b0f3b0f682
This commit is contained in: