DO NOT MERGE: SF: disable HW vsync while dozing am: 46d455b3ab am: eee8fc1cd2  -s ours
am: ddd347c298

Change-Id: I05f442bcd1d03b1adde9fc3ec78d5ed566c45d9b