Merge branch 'main' into petea-keywindow

Author: petea

GoogleSignIn/Tests/Unit/GIDEMMErrorHandlerTest.m

@@ -152,9 +152,6 @@ - (void)testNoEMMError {
   XCTAssertNil(_presentedViewController);
 }
 
-// TODO(petea): Figure out why we have a race condition for the first of these to run.
-#if !SWIFT_PACKAGE
-
 // Verifies that the handler handles general EMM error with user tapping 'OK'.
 - (void)testGeneralEMMErrorOK {
   __block BOOL completionCalled = NO;
@@ -521,8 +518,6 @@ - (void)testKeyWindow {
               isClassSelector:YES];
 }
 
-#endif
-
 @end
 
 NS_ASSUME_NONNULL_END