tree dc131ef5462f0f480eb035a08312900336cc762c
parent 4c8e31db5da367e3ce6a369bba4c4dca0422b655
parent 065dc70c5a510a8133c97c2285af8968777f1c46
author Jeff Sharkey <jsharkey@android.com> 1507765964 +0000
committer android-build-merger <android-build-merger@google.com> 1507765964 +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
am: 065dc70c5a

Change-Id: I7b1310f3b2329d91d347e814a7770c5b57702f5b