Merge "usb: gadget: mbim: Remove duplicate unlock" into msm-3.4