Merge branch 'master' into 'master'

Fix build failure

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

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

@@ -744,7 +744,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
     }
 
     @Override
-    public PaginationResult getAppSubscribedDevices(int i, int i1, List<Integer> list, String s)
+    public PaginationResult getAppSubscribedDevices(int i, int i1, List<Integer> list, List<String> list1)
             throws DeviceManagementException {
         return null;
     }