Merge "Fix problem where wrong colors would be picked"

        userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),

                Binder.getCallingUid(), userId, false, true, "clearWallpaper", null);

        WallpaperData data = null;

        synchronized (mLock) {

            clearWallpaperLocked(false, which, userId, null);

            if (which == FLAG_LOCK) {

                data = mLockWallpaperMap.get(userId);

            }

            if (which == FLAG_SYSTEM || data == null) {

                data = mWallpaperMap.get(userId);

            }

        }

        // When clearing a wallpaper, broadcast new valid colors

        WallpaperData data = getWallpaperSafeLocked(mCurrentUserId, which);

        if (data != null) {

            notifyWallpaperColorsChanged(data, which);

        }

    }

    void clearWallpaperLocked(boolean defaultFailed, int which, int userId, IRemoteCallback reply) {

        if (which != FLAG_SYSTEM && which != FLAG_LOCK) {