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

Change-Id: I27ca7dfc0618b18865379441f0ab32d06477d220