Merge "SurfaceFlinger: VSyncPredictor should be robust with inconsistent vsyncs"