tree 3ceabc12c867edac448a5ad4a3c93ae9feb32a64
parent 9220dda5b838bace8942d54392a07833cd7f1073
parent 1dcb8522fabd9ef55d6ec703d055133d6b4f0e3a
author Jeff Sharkey <jsharkey@android.com> 1508367351 +0000
committer android-build-merger <android-build-merger@google.com> 1508367351 +0000

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 am: a637e31547  -s ours am: a00521b3a0 am: 16776b64c8
am: 1dcb8522fa

Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9