Merge "Merge "Fix race condition clearing VSYNC enable on VrFlinger startup." into oc-dr1-dev am: 8f09b6ab am: e0433c8d" into oc-mr1-dev-plus-aosp