Merge changes from topic "merge_AP2A.240605.024" into aosp-main-future

* changes:
  Revert^2 "SF: Introduce VsyncTimeline to VsyncPredictor"
  Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future