Merge "ENR: do not skip resetting content alpha when alpha is 0" into main

        final boolean shouldSkipHideSensitiveAnimation =

            mShowingPublic && isShowingLayoutNotChanged;

        if (!animated || shouldSkipHideSensitiveAnimation) {

            // In some edge cases, the showing layout's alpha might be 0. In these cases,

            // we need to reset content alpha!

            final NotificationContentView showingLayout = getShowingLayout();

            final boolean showingLayoutNeedsAlphaReset = showingLayout.getAlpha() == 0;

            if (!NotificationContentAlphaOptimization.isEnabled()

                    || mShowingPublic != oldShowingPublic) {

                    || mShowingPublic != oldShowingPublic || showingLayoutNeedsAlphaReset) {

                // Don't reset the alpha or cancel the animation if the showing layout doesn't

                // change

                mPublicLayout.animate().cancel();