Merge "DisplayCutout: make cutout info available on Display object"

  public final class Display {

    method public long getAppVsyncOffsetNanos();

    method public android.view.DisplayCutout getCutout();

    method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);

    method public int getDisplayId();

    method public int getFlags();

import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE;

import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.app.KeyguardManager;

import android.content.res.CompatibilityInfo;

        return getRotation();

    }

    /**

     * Returns the {@link DisplayCutout}, or {@code null} if there is none.

     *

     * @see DisplayCutout

     */

    @Nullable

    public DisplayCutout getCutout() {

        synchronized (this) {

            updateDisplayInfoLocked();

            return mDisplayInfo.displayCutout;

        }

    }

    /**

     * Gets the pixel format of the display.

     * @return One of the constants defined in {@link android.graphics.PixelFormat}.

import static android.view.DisplayInfoProto.LOGICAL_WIDTH;

import static android.view.DisplayInfoProto.NAME;

import android.annotation.Nullable;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

     *

     * @hide

     */

    @Nullable

    public DisplayCutout displayCutout;

    /**