Merge "Update Intent#resolveTypeIfNeeded() for intent filter matching"