Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9
Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
This commit is contained in: