Merge "graphics: improve PRESENT_OR_VALIDATE_DISPLAY support"
am: f43ab227a5

Change-Id: Ief20e5b035a25b77fe714b0ace4d3d4fa543380d