Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev

Author: Amith Yamasani

services/java/com/android/server/WallpaperManagerService.java

@@ -768,10 +768,6 @@ boolean bindWallpaperComponentLocked(ComponentName componentName, boolean force,
             WallpaperConnection newConn = new WallpaperConnection(wi, wallpaper);
             intent.setComponent(componentName);
             int serviceUserId = wallpaper.userId;
-            // Because the image wallpaper is running in the system ui
-            if (componentName.equals(wallpaper.imageWallpaperComponent)) {
-                serviceUserId = 0;
-            }
             intent.putExtra(Intent.EXTRA_CLIENT_LABEL,
                     com.android.internal.R.string.wallpaper_binding_label);
             intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(