Remove unintentional changes happended during mergings

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

@@ -79,7 +79,6 @@ public final class AndroidConstants {
         public static final String WIFI = "WIFI";
         public static final String CAMERA = "CAMERA";
         public static final String DEVICE_MUTE = "DEVICE_MUTE";
-        public static final String RUNTIME_PERMISSION_POLICY = "RUNTIME_PERMISSION_POLICY";
         public static final String PASSCODE_POLICY = "PASSCODE_POLICY";
         public static final String DEVICE_INFO = "DEVICE_INFO";
         public static final String ENTERPRISE_WIPE = "ENTERPRISE_WIPE";

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/modules/business-controllers/policy.js

@@ -1,3 +1,4 @@
+ /*
  * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/js/android-policy-operations.js

@@ -32,7 +32,7 @@ var androidOperationConstants = {
     "APPLICATION_OPERATION": "app-restriction",
     "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
     "KIOSK_APPS_CODE": "KIOSK_APPS",
-    "KIOSK_APPS": "cosu-whitelisted-applications",
+    "KIOSK_APPS": "cosu-whitelisted-applications"
 };
 
 /**