Merge branch 'master' into 'master'

Fix: wrong uri for operation upgrade-firmware

See merge request entgra/carbon-device-mgt!435

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/test/resources/device-types/android.xml

@@ -202,7 +202,7 @@
                     </uiParams>
                 </params>
                 <metadata>
-                    <uri>/api/device-mgt/android/v1.0/admin/devices/reboot</uri>
+                    <uri>/api/device-mgt/android/v1.0/admin/devices/upgrade-firmware</uri>
                     <method>POST</method>
                     <contentType>application/json</contentType>
                     <permission>/device-mgt/devices/owning-device/operations/android/upgrade-firmware</permission>