Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0
am: 72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
This commit is contained in: