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

Change-Id: I9f3f5881217c1aa7cfd25c54265d249ce923bec2