DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853
am: 7512875224

Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec