tree f1a1ae330784a8b16fa86c5f9db881c8f8cb19f5
parent e39f0c21f98e8d76ed8afcc9acc73da4b694c342
parent 16776b64c8163a3ed4f9e5632644a18d3c3f25eb
author Jeff Sharkey <jsharkey@android.com> 1508363566 +0000
committer android-build-merger <android-build-merger@google.com> 1508363566 +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

Change-Id: I96d84487e79ac34428c1b784228745074499cbd9