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

Change-Id: Ic10087594889b2e846fb5cfdc586cc9de4f51b6f