Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev am: 8f09b6abec
am: e0433c8d96

Change-Id: I3a2d60264479baa68561aedc0c44ad43291aeb8a