ACP2E-3296: Checkout order email confirmation is sent to emails entered in First/Last name

Author: glanujnehra

app/code/Magento/Quote/Model/CustomerManagement.php

@@ -153,6 +153,11 @@ public function validateAddresses(QuoteEntity $quote)
             $addresses[] = $this->customerAddressRepository->getById(
                 $quote->getBillingAddress()->getCustomerAddressId()
             );
+        }
+        if ($quote->getShippingAddress()->getCustomerAddressId()) {
+            $addresses[] = $this->customerAddressRepository->getById(
+                $quote->getShippingAddress()->getCustomerAddressId()
+            );
         } else {
             $billingAddress = $quote->getBillingAddress();
             $customerAddress = $this->customerAddressFactory->create();
@@ -166,11 +171,6 @@ public function validateAddresses(QuoteEntity $quote)
             $customerAddress->setCustomAttributes($billingAddress->getCustomAttributes());
             $addresses[] = $customerAddress;
         }
-        if ($quote->getShippingAddress()->getCustomerAddressId()) {
-            $addresses[] = $this->customerAddressRepository->getById(
-                $quote->getShippingAddress()->getCustomerAddressId()
-            );
-        }
 
         foreach ($addresses as $address) {
             $validator = $this->validatorFactory->createValidator('customer_address', 'save');