Merge "[Graphics] Only validate display in PresentOrValidateDisplay."
am: 0a0fa7209e

Change-Id: I174b127b17f6e9c2198da681f8272b26b110139d