tree 2a33537b3629c8312bf0bd9f8e255f637ff0a819
parent 47bc5fba053a6f4942b0dc23a169c826deab292d
parent 250d5e60b094f84eda469b7969ef56c73c36862f
author Jeff Sharkey <jsharkey@android.com> 1507758134 +0000
committer android-build-merger <android-build-merger@google.com> 1507758134 +0000

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

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6