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

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

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

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

Author: Treehugger Robot