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

Change-Id: Ia1cd849727945c31e2359b0bf153f0bbd02a7067