Merge changes from topic "am-4cd350e8fb67414d90bad54bd1a99743" into main

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

Author: android-build-merge-worker-robot