Merge "Bring back LCD disable brightness decrease" into ics

        if (mLightSensorValue != value) {

            mLightSensorValue = value;

            if ((mPowerState & BATTERY_LOW_BIT) == 0) {

                int lcdValue = getAutoBrightnessValue(value, mLastLcdValue,

                // use maximum light sensor value seen since screen went on for LCD to avoid flicker

                // we only do this if we are undocked, since lighting should be stable when

                // stationary in a dock.

                int lcdValue = getAutoBrightnessValue(

                        (mIsDocked ? value : mHighestLightSensorValue),

                        mLastLcdValue,

                        (mCustomLightEnabled ? mCustomLightLevels : mAutoBrightnessLevels),

                        (mCustomLightEnabled ? mCustomLcdValues : mLcdBacklightValues));