Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev

        // persist if beyond new thresholds

        final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()

                : System.currentTimeMillis();

        synchronized (mStatsLock) {

            mDevRecorder.maybePersistLocked(currentTime);

            mXtRecorder.maybePersistLocked(currentTime);

            mUidRecorder.maybePersistLocked(currentTime);

            mUidTagRecorder.maybePersistLocked(currentTime);

        }

        // re-arm global alert

        registerGlobalAlert();