Merge branch 'delete-device' into 'master'

Fix test failure

See merge request entgra/carbon-device-mgt-plugins!53

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidDeviceUtils.java

@@ -582,9 +582,11 @@ public class AndroidDeviceUtils {
             throws DeviceManagementException {
         try {
             List<? extends Operation> pendingOperations = getPendingOperations(deviceIdentifier);
-            for (Operation operation : pendingOperations) {
+            if (pendingOperations != null && !pendingOperations.isEmpty()) {
-                operation.setStatus(Operation.Status.ERROR);
+                for (Operation operation : pendingOperations) {
-                AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation);
+                    operation.setStatus(Operation.Status.ERROR);
+                    AndroidAPIUtils.getDeviceManagementService().updateOperation(deviceIdentifier, operation);
+                }
             }
         } catch (OperationManagementException e) {
             String msg = "Error occurred while retrieving pending operations to update operation statuses of " +