Merge "usb: gadget: u_bam: Correct nested locking flags" into msm-3.0