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

Change-Id: Ic458ecb4de2601c26ade5bc53abfe30a38201dc2