Merge UQ1A.231205.015

Bug: 308969284
Merged-In: Ib3ccc703aba169eba719121c42cbc248d7d5d477
Change-Id: I47cd9c92e39ae43730b1195379235913300a49c0

device-lynx.mk

@@ -206,7 +206,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=19
+    ro.vendor.build.svn=22
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -286,3 +286,8 @@ PRODUCT_PACKAGES += \
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+# Quick Start device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.quick_start.oem_id=00e0 \
+    ro.quick_start.device_id=lynx