Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970  -s ours am: 7f108b81b3
am: 4a71a2daf6

Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c