Merge tag 'LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0' into int/12/fp4

LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0

* tag 'LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0':
  USB: Enable RNDIS with proper configuration
  USB: Set sys.usb.mtp.batchcancel for targets using mtp over ffs
  init.qcom.usb.sh: Pass blank MSM serial number for virtual Android
  init.qti.usb.debug.rc: Add RC to execute init.qti.usb.debug.sh
  init.qcom.usb.sh: Set default composition to 0x9084 for monaco
  init.qcom.usb.sh: Set default USB composition for monaco
  USB: Configure Diag MDM instance on 90D9

Change-Id: Id9d26187482403d8d5378f50a0c90c1b0d1a0902
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index a7e7faf..7e33c83 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -150,7 +150,7 @@
 	fi
 
 	machine_type=`cat /sys/devices/soc0/machine`
-	setprop vendor.usb.product_string "$machine_type-$soc_hwplatform _SN:$msm_serial_hex"
+	setprop vendor.usb.product_string "Fairphone 4 5G"
 
 	# ADB requires valid iSerialNumber; if ro.serialno is missing, use dummy
 	serialnumber=`cat /config/usb_gadget/g1/strings/0x409/serialnumber 2> /dev/null`