tree 9b35930ad542c536a202f0c6443193c027003ecc
parent 8f2a69fad3ab2f89fc2a1c08e4b2381faf1acf89
parent 629553fb49ca26a50da2813f75108dc08d79bfce
author Jeff Sharkey <jsharkey@android.com> 1508358391 +0000
committer android-build-merger <android-build-merger@google.com> 1508358391 +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

Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550