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

Change-Id: I97fb34da3ede919f3bc5e7dc221b16791c6e362c