Revert^2 Disable Settings large-screen optimization am: 270bec00cc

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/23036419

Change-Id: I28211a7c851b181d720a6af6e6f61c427e8d08fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index f01655c..47de829 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -114,7 +114,8 @@
 	device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.camera.fixed_fps_range_boost=1
+    persist.vendor.camera.fixed_fps_range_boost=1 \
+	vendor.camera.multicam.enable_p23_multicam=true
 
 # Display Config
 PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index a926be3..6de904f 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -240,6 +240,9 @@
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
+PRODUCT_PROPERTY_OVERRIDES += \
+	vendor.camera.multicam.enable_p23_multicam=true
+
 # tetheroffload HAL
 PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service