tree 3778fbcb62643945273b35dd875f7105009e8745
parent 04b96d76a9a261787b9d9a138d2937d885daeede
parent d87d2746a9481964d45083a5a32b7a494f0341c7
author Jeff Sharkey <jsharkey@android.com> 1507753895 +0000
committer android-build-merger <android-build-merger@google.com> 1507753895 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: d87d2746a9

Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23