Merge "Improve debugging for multi-instance in split-screen"

        final int userId = aInfo != null && aInfo.applicationInfo != null

                ? UserHandle.getUserId(aInfo.applicationInfo.uid) : 0;

        final int launchMode = aInfo != null ? aInfo.launchMode : 0;

        if (err == ActivityManager.START_SUCCESS) {

            Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true, true, false)

                    + "} from uid " + callingUid);

                    + "} with " + launchModeToString(launchMode) + " from uid " + callingUid);

        }

        ActivityRecord sourceRecord = null;