Merge "Fix AnimationUtils getExpectedPresentationTimeNanos" into main