tree 9b35930ad542c536a202f0c6443193c027003ecc
parent fe1daa6edacaae69a2766aa915ad7c6afd7346cc
parent 53a69985b3b722049eb9dd05918477a41a831ba1
author Jeff Sharkey <jsharkey@android.com> 1507756809 +0000
committer android-build-merger <android-build-merger@google.com> 1507756809 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239
am: 53a69985b3

Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3