[automerger skipped] Merge "[Graphics] Only validate display in PresentOrValidateDisplay." am: 0a0fa7209e am: 8a7dc8e57b
am: 913b3f5932  -s ours

Change-Id: I097c08b157c70e9e201f0c664be1359d232bb43e