tree bc46e97be562d25cb6cabcfaa9cd8e9791a98f63
parent 556688abdb3725920e28844babf94a3f5b38f873
parent e38a7f42ab466806e6653f4be8e0ce71a4b9b15e
author Jeff Sharkey <jsharkey@android.com> 1507753693 +0000
committer android-build-merger <android-build-merger@google.com> 1507753693 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e