tree aed913bfb2c48d3b0833789496a0e6c3ee65ff63
parent 1b1ea965ee9065e3348a0dc5759d2cf60db3bd08
parent 753a9ab308da5e0bc4e55f1b5bb21688562f5a04
author Jeff Sharkey <jsharkey@android.com> 1507763740 +0000
committer android-build-merger <android-build-merger@google.com> 1507763740 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4  -s ours am: bbcb8e4976
am: 753a9ab308

Change-Id: I73681573fc302c587490df16c214ee05049be7c6