Merge "Revert "Mark WindowMagnificationAnimationControllerTest as flaky"" into main