Snap for 12368321 from dacaa866b5 to 24Q4-release

Change-Id: I47559213fce4e89b2b9c169a0c1ccab0e8969907

BoardConfig-common.mk

@@ -51,8 +51,6 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
   BOARD_KERNEL_CMDLINE += kunit.enable=1
 endif
 
-BOARD_KERNEL_CMDLINE += ehld.noehld=1
-
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)

conf/init.zumapro.usb.rc

@@ -252,6 +252,8 @@ on early-boot
     setprop vendor.usb.functions.ready 1
 
 on boot
+    # Set USB timeout
+    write sys/module/usbcore/parameters/initial_descriptor_timeout 500
     # Use USB Gadget HAL
     setprop sys.usb.configfs 2
     # Enable in-kernel media-presence polling for SD cards

device.mk

@@ -400,6 +400,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 # GRAPHICS - GPU (end)
 # ####################
 
+PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
+
 # Device Manifest, Device Compatibility Matrix for Treble
 DEVICE_MANIFEST_FILE := \
 	device/google/zumapro/manifest.xml
@@ -425,8 +427,6 @@ DEVICE_MATRIX_FILE := \
 
 DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
 
-PRODUCT_SHIPPING_API_LEVEL := 34
-
 # RKP VINTF
 -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk