tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent 75128752246b5181ff8f76be081df7d5455945f3
parent 300e6ffafb04121a93486821eef9c91652504d16
author Jeff Sharkey <jsharkey@android.com> 1507758697 +0000
committer android-build-merger <android-build-merger@google.com> 1507758697 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571
am: 300e6ffafb

Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f