Merge "Remove unnecessary synchronized block"

                KeyValueBackupJob.schedule(mUserId, mContext, mConstants);

            } else {

                if (DEBUG) Slog.v(TAG, "Scheduling immediate backup pass");

                synchronized (mQueueLock) {

                    // Fire the intent that kicks off the whole shebang...

                    try {

                        mRunBackupIntent.send();

                        // should never happen

                        Slog.e(TAG, "run-backup intent cancelled!");

                    }

                    // ...and cancel any pending scheduled job, because we've just superseded it

                    KeyValueBackupJob.cancel(mUserId, mContext);

            }

            }

        } finally {

            Binder.restoreCallingIdentity(oldId);

        }