Merge \\"HWC2: Skip validate/present if display is off\\" into nyc-mr1-dev am: 9409a53b45
am: 495a15491f

Change-Id: If771408108db1ded2b2fae404e98c439aa4ce911