Merge cherrypicks of [20312128] into tm-qpr1-release.

Change-Id: Ie467e14221dde42d8792adef9af924aba88741f0
diff --git a/device-oriole.mk b/device-oriole.mk
index 176175b..c9e69ab 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -243,9 +243,9 @@
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio
+# declare use of spatial audio: disabled
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=true
+    ro.audio.spatializer_enabled=false
 
 PRODUCT_PACKAGES += \
 	libspatialaudio
diff --git a/device-raven.mk b/device-raven.mk
index 19e940b..c337c13 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -256,9 +256,9 @@
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio
+# declare use of spatial audio: disabled
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=true
+    ro.audio.spatializer_enabled=false
 
 PRODUCT_PACKAGES += \
 	libspatialaudio