tree fbb0f18b72dc8626f8d88a887e41ad2502eebf14
parent e9d2113af7306ae247e2176e6c9d0a1ab55ff2f0
parent 8916c30c54c0354a92eebd9b0fbbfd42665e5e15
author Jeff Sharkey <jsharkey@android.com> 1507756852 +0000
committer android-build-merger <android-build-merger@google.com> 1507756852 +0000

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

Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36