Merge "Lockscreen - AOD layout adjustments"

        clockYDark = MathUtils.lerp(clockYBouncer, clockYDark, shadeExpansion);

        float darkAmount = mBypassEnabled && !mHasCustomClock ? 1.0f : mDarkAmount;

        // TODO(b/12836565) - prototyping only adjustment

        if (mLockScreenMode != KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) {

            // This will keep the clock at the top for AOD

            darkAmount = 0f;

        }

        return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mEmptyDragAmount);

    }