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

Change-Id: I6f5226370c58c5f1304ab1b46f1c7753bcc11fda