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

Change-Id: I229532f14a0ff846964735e2826088e0e7070e1e