Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev

    private void updateUserActivitySummaryLocked(long now, int dirty) {

        // Update the status of the user activity timeout timer.

        if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY

                | DIRTY_WAKEFULNESS | DIRTY_SETTINGS

                | DIRTY_SCREEN_BRIGHTNESS_BOOST)) != 0) {

                | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) != 0) {

            mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);

            long nextTimeout = 0;