DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571
am: 300e6ffafb

Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f