[automerger skipped] Merge "SF: VsyncTimeline::isVSyncInPhase should use...

[automerger skipped] Merge "SF: VsyncTimeline::isVSyncInPhase should use display rate [unflagged]" into android15-tests-dev am: 19dd0366 -s ours am: 20d20a6f -s ours am: 970d40c8 -s ours

am skip reason: Merged-In I02deca58bfd9a2cf169c2e58995cc42eeb854c8d with SHA-1 03ceb6d3 is already in history

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



Change-Id: Iec1a236d8af1c27fa320b2fdb515d675f4c42b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>