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
am: 073fad6cfe

Change-Id: I53daac62c1b770c1172c15858e8eed26f4a22ec2