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

Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca