Fix build

Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6

Author: Amith Yamasani

services/java/com/android/server/am/ActivityManagerService.java

@@ -2626,7 +2626,7 @@ public final int startActivities(IApplicationThread caller,
             Intent[] intents, String[] resolvedTypes, IBinder resultTo, Bundle options,
             int userId) {
         enforceNotIsolatedCaller("startActivities");
-        userId = handleIncomingUserLocked(Binder.getCallingPid(), Binder.getCallingUid(), userId,
+        userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId,
                 false, true, "startActivity", null);
         int ret = mMainStack.startActivities(caller, -1, intents, resolvedTypes, resultTo,
                 options, userId);