MC-38620: Merge release branch into 2.4-develop

fix tests after merge

Author: zakdma

app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php

@@ -270,7 +270,8 @@ public function testDispatchWithDefaultCustomerGroupId()
         $this->quoteMock->expects($this->exactly(2))
             ->method('getCustomerGroupId')
             ->willReturn('customerGroupId');
-        $this->customerMock->expects($this->exactly(2))->method('getId')->willReturn('1');
+        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
+
         /** Assertions */
         $this->quoteAddressMock->expects($this->once())
             ->method('setPrevQuoteCustomerGroupId')
@@ -323,7 +324,6 @@ public function testDispatchWithCustomerCountryInEU()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
-        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())
@@ -431,8 +431,6 @@ public function testDispatchWithEmptyShippingAddress()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
-        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
-
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())