Merge "Whitelist ResolveActivity for explicit instant intents" into pi-dev am: bf67b4ede0
am: c3cf767237

Change-Id: Ia1720ab625837f33cb3789f013f644c63564d07c