Generalise address perference unsetting

Author: torreytsui

app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php

@@ -130,11 +130,6 @@ private function updateShippingAddress(Quote $quote, array $details)
         $shippingAddress->setCollectShippingRates(true);
 
         $this->updateAddressData($shippingAddress, $details['shippingAddress']);
-
-        // PayPal's address supposes not saving against customer account
-        $shippingAddress->setSaveInAddressBook(false);
-        $shippingAddress->setSameAsBilling(false);
-        $shippingAddress->unsCustomerAddressId();
     }
 
     /**
@@ -157,11 +152,6 @@ private function updateBillingAddress(Quote $quote, array $details)
         $billingAddress->setFirstname($details['firstName']);
         $billingAddress->setLastname($details['lastName']);
         $billingAddress->setEmail($details['email']);
-
-        // PayPal's address supposes not saving against customer account
-        $billingAddress->setSaveInAddressBook(false);
-        $billingAddress->setSameAsBilling(false);
-        $billingAddress->unsCustomerAddressId();
     }
 
     /**
@@ -182,5 +172,10 @@ private function updateAddressData(Address $address, array $addressData)
         $address->setRegionCode($addressData['region']);
         $address->setCountryId($addressData['countryCodeAlpha2']);
         $address->setPostcode($addressData['postalCode']);
+
+        // PayPal's address supposes not saving against customer account
+        $address->setSaveInAddressBook(false);
+        $address->setSameAsBilling(false);
+        $address->unsCustomerAddressId();
     }
 }