DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours
am: 08bd3a75fb
Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0
This commit is contained in: