Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6  -s ours am: 5f17a285f9 am: 98371ee7c9 am: e0e1c8ae4c
am: b49d357915  -s ours

Change-Id: Ib8d2efccb01873827335ca6eece42ca738b67e0c