Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev

        // Collect information about the target of the Intent.

        ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,

                profileFile, profileFd, userId);

        if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo,

                null, 0)) {

        if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_MULTIPROCESS) == 0

                && mService.isSingleton(aInfo.processName, aInfo.applicationInfo, null, 0)) {

            userId = 0;

        }

        aInfo = mService.getActivityInfoForUser(aInfo, userId);