DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours
am: 73a4e88df8
Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614
This commit is contained in: