zenfone9: Adapt to new product override scheme

Depends-On: Ib44a3bb573d08d492acc092e104cb4f687f3b168
Change-Id: I897bf01652c7338b9f12f3264021876c351757dd
diff --git a/omni_zenfone9.mk b/omni_zenfone9.mk
index 5d40271..950a9ab 100644
--- a/omni_zenfone9.mk
+++ b/omni_zenfone9.mk
@@ -56,15 +56,13 @@
 PRODUCT_SYSTEM_DEVICE := ASUS_AI2202
 PRODUCT_SYSTEM_NAME := WW_AI2202
 
+
+PRODUCT_BUILD_PROP_OVERRIDES := \
+    BuildFingerprint=asus/WW_AI2202/ASUS_AI2202:14/UKQ1.230924.001/34.0304.2004.87:user/release-keys \
+    DeviceName=$(PRODUCT_SYSTEM_DEVICE) \
+    DeviceProduct=$(PRODUCT_SYSTEM_NAME) \
+    SystemDevice=$(PRODUCT_SYSTEM_DEVICE) \
+    SystemName=$(PRODUCT_SYSTEM_NAME)
+
 OMNI_PRODUCT_PROPERTIES += \
     ro.build.product=AI2202
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_DEVICE=ASUS_AI2202 \
-    PRODUCT_NAME=WW_AI2202 \
-    TARGET_DEVICE=AI2202 \
-    TARGET_PRODUCT=WW_AI2202
-
-VENDOR_RELEASE := 14/UKQ1.230924.001/34.0304.2004.87:user/release-keys
-BUILD_FINGERPRINT := asus/WW_AI2202/ASUS_AI2202:$(VENDOR_RELEASE)
-OMNI_BUILD_FINGERPRINT := asus/WW_AI2202/ASUS_AI2202:$(VENDOR_RELEASE)