Merge "Revert "Explicitly set other mocking URLConnections to deflake test"" into main