Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c
am: b4d23d55c2

Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7