ACP2E-2791: Not able to Save Customer attribute information in Admin Edit customer section;

Author: pradeep1819

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -66,14 +66,14 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
     private $subscriptionManager;
 
     /**
-     * @var SetCustomerStore
+     * @var AddressRegistry
      */
-    private $customerStore;
+    private $addressRegistry;
 
     /**
-     * @var AddressRegistry
+     * @var SetCustomerStore|null
      */
-    private $addressRegistry;
+    private $customerStore;
 
     /**
      * Constructor
@@ -104,8 +104,8 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      * @param ForwardFactory $resultForwardFactory
      * @param JsonFactory $resultJsonFactory
      * @param SubscriptionManagerInterface $subscriptionManager
-     * @param SetCustomerStore $customerStore
      * @param AddressRegistry|null $addressRegistry
+     * @param SetCustomerStore|null $customerStore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -135,8 +135,8 @@ public function __construct(
         ForwardFactory $resultForwardFactory,
         JsonFactory $resultJsonFactory,
         SubscriptionManagerInterface $subscriptionManager,
-        SetCustomerStore $customerStore,
-        AddressRegistry $addressRegistry = null
+        AddressRegistry $addressRegistry = null,
+        ?SetCustomerStore $customerStore = null
     ) {
         parent::__construct(
             $context,
@@ -166,8 +166,8 @@ public function __construct(
             $resultJsonFactory
         );
         $this->subscriptionManager = $subscriptionManager;
-        $this->customerStore = $customerStore;
         $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
+        $this->customerStore = $customerStore ?: ObjectManager::getInstance()->get(SetCustomerStore::class);
     }
 
     /**