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

Change-Id: Ia369c6436029f65fe46a379f400692751314faf5