tree 81b2031a2ba4dc550c626c0d38a9eff03e57ca13
parent 5b2a431787f27b1d183d0c08db025e2295ccde25
parent 45fc104958ce96176f16f41c83399e3402e198bf
author Jeff Sharkey <jsharkey@android.com> 1508351355 +0000
committer android-build-merger <android-build-merger@google.com> 1508351355 +0000

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97  -s ours
am: 45fc104958  -s ours

Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb