Merge "Updating ActivityIntentResolver...

…so that queryIntents doesn't return protected applications."