Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff