tree 2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7
parent 00183554a9330d98a6ba73ae2bcd83e237be8831
parent 76d9732106e89aa3539e583f95641fcd54bb300d
author Jeff Sharkey <jsharkey@android.com> 1508460417 +0000
committer android-build-merger <android-build-merger@google.com> 1508460417 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc  -s ours am: edb6b17ebc  -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b  -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb
am: 76d9732106

Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e