DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d36 -s ours am: b52056d5 am: 563ea682 am: 901c587c Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1