Merge "Revert "DisplayCutout: Add back always resource"" into pi-dev

            Corresponds to <code>LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES</code>.

            -->

            <enum name="shortEdges" value="1" />

            <!-- Use <code>shortEdges</code> instead. This is temporarily here to unblock pushing

                 the SDK until all usages have been migrated to <code>shortEdges</code> -->

            <enum name="always" value="1" />

            <!-- <p>

            The window is never allowed to overlap with the <code>DisplayCutout</code> area.

            <p>