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

Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9