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

Change-Id: I393058caae6a8cc446597509b20241723f22a238