GraphQL-431: Updated to the latest Dev. Resolved conflicts

Author: AleksLi

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php

@@ -11,7 +11,6 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Quote\Model\Quote\Address;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -35,11 +34,6 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
-    /**
-     * @var Address
-     */
-    private $quoteShippingAddress;
-
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -51,7 +45,6 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->quoteShippingAddress = $objectManager->get(Address::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }