Merge "DO NOT MERGE: Eliminate redundant changes to hardware vsync state." into cw-f-dev am: 9e5585930a am: f613f073b2  -s ours am: 4c0bb0a09a
am: 9a41a3483a

Change-Id: I65d061197561958cce50bc4a34b0123a25d17687