Merge "Use correct brightness when manual brightness is enabled."

        }

        // Apply manual brightness.

        // Use the current brightness setting from the request, which is expected

        // provide a nominal default value for the case where auto-brightness

        // is not ready yet.

        if (brightness < 0) {

            brightness = clampScreenBrightness(mLastUserSetScreenBrightness);

            brightness = clampScreenBrightness(mCurrentScreenBrightnessSetting);

        }