Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java

@@ -65,8 +65,7 @@ public class DeviceTypeManagerService implements DeviceManagementService {
         this.operationMonitoringConfigs = new OperationMonitoringTaskConfig();
         this.setOperationMonitoringConfig(deviceTypeConfiguration);
         this.setInitialOperationConfig(deviceTypeConfiguration);
-        if (deviceTypeConfiguration.getPolicyMonitoring() != null && deviceTypeConfiguration.getPolicyMonitoring()
+        if (deviceTypeConfiguration.getPolicyMonitoring() != null ) {
-                .isEnabled()) {
             this.policyMonitoringManager = new DefaultPolicyMonitoringManager();
         }
     }