Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am: 31c5adc279

Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d