tree 1a94d2393748b061aada9d5abe1fb58710874212
parent a7f0504849e6f80a4bd8a39088f979fbf2b7dc46
parent 620c5cfda070d69606b61f9a5cb3fc142f4ea4ea
author Jeff Sharkey <jsharkey@android.com> 1507761346 +0000
committer android-build-merger <android-build-merger@google.com> 1507761346 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4  -s ours
am: 620c5cfda0

Change-Id: I07805d81dbcf65993d5dcb695d9877ad4a914bac