Merge branch 'master' into 'master'

Master

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

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

@@ -60,4 +60,10 @@ public class DeviceInformationManagerServiceMock implements DeviceInformationMan
     public int publishEvents(String s, String s1, String s2, String s3) throws DeviceDetailsMgtException {
         return 0;
     }
+
+    @Override
+    public void addDeviceLocations(Device device, List<DeviceLocation> deviceLocations) throws
+            DeviceDetailsMgtException{
+
+    }
 }