Merge "Mark test as flaky to unblock presubmits." into main