Merge "SurfaceAnimationRunnerTest: Remove @FlakyTest" into main