Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into...

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 25436996 am: 4a60106a am: 72df9705 am: da3d1059 am: 97f6a0da  -s ours am: 3b47256c am: a7f05048" into oc-dr1-dev-plus-aosp am: 6ef8866b
am: 6530612c  -s ours

Change-Id: I4f9d6946e30f63200b66c0c04744feccc03f267a