Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am: 9d3706046c

Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef