DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: 1f2a5d3622 -s ours
Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae
This commit is contained in:
am: 1f2a5d3622 -s ours
Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae