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

Change-Id: Ib303319820e99b0b2baf6371727cb98de2682386