Merge "Prevent brightness changes before boot complete." into nyc-mr1-dev

            float screenAutoBrightnessAdjustment = 0.0f;

            boolean autoBrightness = (mScreenBrightnessModeSetting ==

                    Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);

            if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {

            if (!mBootCompleted) {

                // Keep the brightness steady during boot. This requires the

                // bootloader brightness and the default brightness to be identical.

                autoBrightness = false;

                brightnessSetByUser = false;

            } else if (isValidBrightness(mScreenBrightnessOverrideFromWindowManager)) {

                screenBrightness = mScreenBrightnessOverrideFromWindowManager;

                autoBrightness = false;

                brightnessSetByUser = false;