Merge "ipq6018: usb: Add support to enable diag gadget through env"