Merge "Exclude insets from new parent config bounds when resolving SCM config" into main

            @NonNull CompatDisplayInsets compatDisplayInsets) {

        final Configuration resolvedConfig = getResolvedOverrideConfiguration();

        final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds();

        final Insets insets;

        if (mResolveConfigHint.mUseOverrideInsetsForConfig) {

            // TODO(b/343197837): Add test to verify SCM behaviour with new bound configuration

            // Insets are decoupled from configuration by default from V+, use legacy

            // compatibility behaviour for apps targeting SDK earlier than 35

            // (see applySizeOverrideIfNeeded).

            insets = Insets.of(mDisplayContent.getDisplayPolicy()

                    .getDecorInsetsInfo(mDisplayContent.mDisplayFrames.mRotation,

                            mDisplayContent.mDisplayFrames.mWidth,

                            mDisplayContent.mDisplayFrames.mHeight).mOverrideNonDecorInsets);

        } else {

            insets = Insets.NONE;

        }

        // When an activity needs to be letterboxed because of fixed orientation, use fixed

        // orientation bounds (stored in resolved bounds) instead of parent bounds since the

        final Rect containerBounds = useResolvedBounds

                ? new Rect(resolvedBounds)

                : newParentConfiguration.windowConfiguration.getBounds();

        final Rect parentAppBounds =

                newParentConfiguration.windowConfiguration.getAppBounds();

        parentAppBounds.inset(insets);

        final Rect containerAppBounds = useResolvedBounds

                ? new Rect(resolvedConfig.windowConfiguration.getAppBounds())

                : newParentConfiguration.windowConfiguration.getAppBounds();

                : parentAppBounds;

        final int requestedOrientation = getRequestedConfigurationOrientation();

        final boolean orientationRequested = requestedOrientation != ORIENTATION_UNDEFINED;