Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 25436996 am: 4a60106a am: 72df9705 Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3