Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6  -s ours am: 5f17a285f9 am: 98371ee7c9
am: e0e1c8ae4c

Change-Id: I4ace250ae2b4998e7c77f361dddd47f815b9ad27