resolve merge conflicts of 044b8c4e1d8ccdda798e39984394090136a359f4 to master

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie90c3bca8cd6a6573ba0245b4e7460d56b65cde8
diff --git a/device-raven.mk b/device-raven.mk
index cccf860..b965539 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -268,6 +268,10 @@
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
 
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true
+
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \