Merge "Mixed up uid and user-id."

Author: Amith Yamasani

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

@@ -6995,7 +6995,7 @@ public void run() {
                         /* TODO: Send this to all users */
                         broadcastIntentLocked(null, null, intent, null, finisher,
                                 0, null, null, null, true, false, MY_PID, Process.SYSTEM_UID,
-                                Process.SYSTEM_UID);
+                                0 /* UserId zero */);
                         if (finisher != null) {
                             mWaitingUpdate = true;
                         }