Merge branch 'newQr' into 'master'

Add new enrollment type to QR code

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

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.platform.configuration/configuration.hbs

@@ -198,6 +198,7 @@
                     <option value="COPE">COPE</option>
                     <option value="COSU">COSU</option>
                     <option value="WORK_PROFILE">WORK_PROFILE</option>
+                    <option value="GOOGLE_ENTERPRISE">GOOGLE_WORK_PROFILE</option>
                 </select>
             </div>
         </div>

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.type-view/type-view.hbs

@@ -114,6 +114,8 @@
                             <option value="COPE">COPE</option>
                             <option value="COSU">COSU (KIOSK)</option>
                             <option value="WORK_PROFILE">WORK PROFILE</option>
+                            <option value="GOOGLE_ENTERPRISE">GOOGLE_WORK_PROFILE</option>
+
                         </select>
                     </div>
                     <div class="text-center" id="android-qr-code">