Merge changes from topic "presubmit-am-36a18669628e494aa03061fbd2edd086" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Build with spatializer feature 2p: 9b73dc2c31
  Build with spatializer feature
diff --git a/device.mk b/device.mk
index 18961b8..49d2b7b 100644
--- a/device.mk
+++ b/device.mk
@@ -940,7 +940,8 @@
 	audio.r_submix.default \
 	libamcsextfile \
 	audio_amcs_ext \
-
+	libspatialaudio \
+	librondo
 
 #Audio Vendor libraries
 PRODUCT_PACKAGES += \
@@ -973,6 +974,10 @@
 	ro.audio.monitorRotation = true \
 	ro.audio.offload_wakelock=false
 
+# DO NOT SUBMIT declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # IAudioMetricExt HIDL
 PRODUCT_PACKAGES += \