Merge "DisplayCutout: Add clarifying images to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES" into pi-dev
am: 95712fe0cb

Change-Id: Icde9a53fd8ff6825654c2992322354b1e7647964