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

Change-Id: I1bb72507f7d4b2e713cc3084217cba025ffaebf6