DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9
am: d20cad62ee

Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042