fix merge conflicts for traccar

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -140,6 +140,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public PaginationResult getAllDevicesIds(PaginationRequest paginationRequest) throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public PaginationResult getAllDevices(PaginationRequest paginationRequest, boolean b)
             throws DeviceManagementException {
@@ -156,6 +161,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override
+    public PaginationResult getAllDevicesIdList(PaginationRequest paginationRequest) throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public Device getDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
         if (TestUtils.getDeviceId().equals(deviceIdentifier.getId())) {