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

Change-Id: I48fb5cdb3e89be877b1d7ac35e9fcaf46a9daefe