[automerger skipped] Merge "SurfaceFlinger: VSyncPredictor should be robust with inconsistent vsyncs" am: 6e95c696ef am: 26dcb669e8 am: 5257f62633 -s ours

am skip reason: Change-Id I192b917196c727b9a97a0d18bae160467f75722d with SHA-1 43a3e69333 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1531290

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68cd8c5ee9359ab0a4684b83e410920200f53316