DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee
am: e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
This commit is contained in: