Revert "Put vendor. prefix to audio sysprops"

This reverts commit 4e4988cf7078b930c13b97246280b7177a072111.

Reason for revert: No vol adjust on calls
No audio in duo vid calls.

Bug: 139108926
Change-Id: Id32d3d1f5c2af7330163a0b6a7f61b87ca537e2a
(cherry picked from commit fae86867a42d267a4335cbe92421f347382a72fb)
diff --git a/device-common.mk b/device-common.mk
index 69d38b3..7ec7af9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -28,8 +28,9 @@
 # Set boot SPL
 BOOT_SECURITY_PATCH = $(PLATFORM_SECURITY_PATCH)
 
+PRODUCT_PROPERTY_OVERRIDES += audio.adm.buffering.ms=3
 PRODUCT_PROPERTY_OVERRIDES += vendor.audio.adm.buffering.ms=3
-PRODUCT_PROPERTY_OVERRIDES += vendor.audio_hal.period_multiplier=2
+PRODUCT_PROPERTY_OVERRIDES += audio_hal.period_multiplier=2
 PRODUCT_PROPERTY_OVERRIDES += af.fast_track_multiplier=1
 PRODUCT_PROPERTY_OVERRIDES += vendor.audio.offload.buffer.size.kb=256
 
diff --git a/device.mk b/device.mk
index bbbe8c2..8b44401 100644
--- a/device.mk
+++ b/device.mk
@@ -217,11 +217,11 @@
 
 # Audio fluence, ns, aec property, voice and media volume steps
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.qc.sdk.audio.fluencetype=fluencepro \
-    persist.vendor.audio.fluence.voicecall=true \
-    persist.vendor.audio.fluence.speaker=true \
-    persist.vendor.audio.fluence.voicecomm=true \
-    persist.vendor.audio.fluence.voicerec=false \
+    ro.qc.sdk.audio.fluencetype=fluencepro \
+    persist.audio.fluence.voicecall=true \
+    persist.audio.fluence.speaker=true \
+    persist.audio.fluence.voicecomm=true \
+    persist.audio.fluence.voicerec=false \
     ro.config.vc_call_vol_steps=7 \
     ro.config.media_vol_steps=25 \
 
@@ -691,7 +691,7 @@
     $(LOCAL_PATH)/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    vendor.audio.snd_card.open.retries=50
+    audio.snd_card.open.retries=50
 
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))