Access Control Follow Up Changes (project-chip#41525)

* Access control follow ups

* Fix build file

* Restyled by gn

---------

Co-authored-by: Restyled.io <[email protected]>

Author: zaid-google

src/app/clusters/access-control-server/ArlEncoder.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <access/AccessRestrictionProvider.h>
+#include <app-common/zap-generated/cluster-objects.h>
 #include <credentials/FabricTable.h>
 
 namespace chip {

src/app/clusters/access-control-server/BUILD.gn

@@ -22,6 +22,7 @@ source_set("arl-encoder") {
 
   public_deps = [
     "${chip_root}/src/access:access",
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/credentials:credentials",
   ]
 }

src/app/clusters/access-control-server/access-control-cluster.cpp

@@ -443,7 +443,6 @@ CHIP_ERROR AccessControlCluster::Startup(ServerClusterContext & context)
 void AccessControlCluster::Shutdown()
 {
     ChipLogProgress(DataManagement, "AccessControlCluster: shutdown");
-    DefaultServerCluster::Shutdown();
 
 #if CHIP_CONFIG_USE_ACCESS_RESTRICTIONS
     auto accessRestrictionProvider = GetAccessControl().GetAccessRestrictionProvider();
@@ -454,6 +453,7 @@ void AccessControlCluster::Shutdown()
 #endif
 
     GetAccessControl().RemoveEntryListener(*this);
+    DefaultServerCluster::Shutdown();
 }
 
 DataModel::ActionReturnStatus AccessControlCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,