DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours
am: b52056d549

Change-Id: I520162dc90c1855d0a6324e62507f78d6ce5b329