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

Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b