Conformance energy managment - Fix for#36827 (#37813)

* Added OTA Requestor Device

* Removing Un-conformant attribute

* Update Device versions

* Other fixes

Author: ratgr

examples/energy-management-app/energy-management-common/energy-management-app.matter

@@ -2576,7 +2576,8 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 1;
+  device type ma_rootdevice = 22, version 3;
+  device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2786,8 +2787,8 @@ endpoint 0 {
 endpoint 1 {
   device type ma_powersource = 17, version 1;
   device type ma_electricalsensor = 1296, version 1;
-  device type energy_evse = 1292, version 1;
-  device type device_energy_management = 1293, version 1;
+  device type energy_evse = 1292, version 2;
+  device type device_energy_management = 1293, version 2;
 
 
   server cluster Identify {

examples/energy-management-app/energy-management-common/energy-management-app.zap

@@ -51,13 +51,22 @@
           "label": "MA-rootdevice",
           "name": "MA-rootdevice",
           "deviceTypeOrder": 0
+        },
+        {
+          "code": 18,
+          "profileId": 259,
+          "label": "MA-otarequestor",
+          "name": "MA-otarequestor",
+          "deviceTypeOrder": 1
         }
       ],
       "deviceVersions": [
+        3,
         1
       ],
       "deviceIdentifiers": [
-        22
+        22,
+        18
       ],
       "deviceTypeName": "MA-rootdevice",
       "deviceTypeCode": 22,
@@ -1606,7 +1615,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2561,9 +2570,9 @@
         }
       ],
       "deviceVersions": [
+        2,
         1,
-        1,
-        1,
+        2,
         1
       ],
       "deviceIdentifiers": [