Merge branch 'application-mgt-new' into 'master'

Fix build failure due to duplicating methods

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

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.core/src/test/java/org/wso2/carbon/device/mgt/mobile/android/core/mokcs/DeviceManagementProviderServiceMock.java

@@ -78,17 +78,6 @@ import java.util.List;
 import java.util.Map;
 
 public class DeviceManagementProviderServiceMock implements DeviceManagementProviderService {
-    @Override
-    public boolean deleteDeviceTypeVersions(DeviceType deviceType)
-            throws DeviceManagementException {
-        return false;
-    }
-
-    @Override
-    public void disEnrollDevices(List<Device> list) throws DeviceManagementException {
-
-    }
-
     @Override
     public List<Device> getAllDevices(String s) throws DeviceManagementException {
         return null;
@@ -697,10 +686,6 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
 
     }
 
-    @Override public boolean deleteDeviceType(String s, DeviceType deviceType) throws DeviceManagementException {
-        return false;
-    }
-
     @Override
     public boolean deleteDeviceType(String s, DeviceType deviceType)
             throws DeviceManagementException {