resolve merge conflicts of c02b2ec3f1 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iabf4bf87cc8aec5dab871096fe320098c4622545

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

@@ -4391,7 +4391,7 @@ public class ActivityManagerService extends IActivityManager.Stub
             // the package was initially frozen through KILL_APPLICATION_MSG, so
             // it doesn't hurt to use it again.)
             forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false,
-                    false, true, false, false, UserHandle.getUserId(app.userId), "start failure");
+                    false, true, false, false, app.userId, "start failure");
             return false;
         }
     }