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

Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120