Modify make files for talos and trinket.
-talos: enabling hw recovery
-trinket: enabling hw recovery and removing virtual display.
          removing hardcoded wide_color_display

CRs-Fixed: 2377253
Change-Id: I683e09eeaa799f5a34fd09f89efa63f58d4da394
diff --git a/config/talos.mk b/config/talos.mk
index a0f1703..4093872 100644
--- a/config/talos.mk
+++ b/config/talos.mk
@@ -60,7 +60,6 @@
     vendor.display.enable_null_display=0 \
     vendor.display.disable_excl_rect=0 \
     vendor.display.comp_mask=0 \
-    vendor.display.disable_hw_recovery=1 \
     vendor.display.enable_default_color_mode=1
 
 # This matrix should be in column major order, per SurfaceFlinger requirement
diff --git a/config/trinket.mk b/config/trinket.mk
index ced2b4a..cc71042 100644
--- a/config/trinket.mk
+++ b/config/trinket.mk
@@ -32,7 +32,6 @@
 TARGET_USES_HWC2 := true
 TARGET_USES_QCOM_DISPLAY_BSP := true
 TARGET_USES_COLOR_METADATA := true
-TARGET_HAS_WIDE_COLOR_DISPLAY := true
 
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.demo.hdmirotationlock=false \
@@ -41,7 +40,6 @@
     debug.egl.hw=0 \
     debug.sf.latch_unsignaled=1 \
     debug.mdpcomp.logs=0 \
-    debug.sf.enable_hwc_vds=1 \
     ro.vendor.display.cabl=2 \
     vendor.gralloc.disable_ubwc=0 \
     vendor.display.disable_scaler=0 \
@@ -50,7 +48,6 @@
     vendor.display.enable_null_display=0 \
     vendor.display.disable_excl_rect=0 \
     vendor.display.comp_mask=0 \
-    vendor.display.disable_hw_recovery=1 \
     vendor.display.enable_default_color_mode=1
 
 # This matrix should be in column major order, per SurfaceFlinger requirement