Merge cherrypicks of [16372369] into sc-qpr1-release.

    private boolean mHasStatusBar = false;

    private int mNavBarFrameHeight = 0;

    /**

     * Different from {@link #equals(Object)}, this method compares the basic geometry properties

     * of two {@link DisplayLayout} objects including width, height, rotation, density and cutout.

     * @return {@code true} if the given {@link DisplayLayout} is identical geometry wise.

     */

    public boolean isSameGeometry(@NonNull DisplayLayout other) {

        return mWidth == other.mWidth

                && mHeight == other.mHeight

                && mRotation == other.mRotation

                && mDensityDpi == other.mDensityDpi

                && Objects.equals(mCutout, other.mCutout);

    }

    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

import com.android.wm.shell.pip.PipUtils;

import java.io.PrintWriter;

import java.util.Objects;

import java.util.Optional;

import java.util.function.Consumer;

    }

    private void onDisplayChanged(DisplayLayout layout, boolean saveRestoreSnapFraction) {

        if (Objects.equals(layout, mPipBoundsState.getDisplayLayout())) {

        if (mPipBoundsState.getDisplayLayout().isSameGeometry(layout)) {

            return;

        }

        Runnable updateDisplayLayout = () -> {