[automerger skipped] Merge "SurfaceFlinger: VSyncPredictor should be robust...

[automerger skipped] Merge "SurfaceFlinger: VSyncPredictor should be robust with inconsistent vsyncs" am: 6e95c696 am: 26dcb669 am: 5257f626 -s ours am: c6845458 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I543dd0e2ad174ac3922398d4a2fbc7ba081aa268