Snap for 10094917 from d3c8c239f90b49618a365662dccfe80615e90277 to udc-qpr1-release

Change-Id: I4e9d2eb5d6bb901bbf4b6ea75d5768a91f5972da

conf/init.lynx.rc

@@ -83,18 +83,6 @@ on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_complet
 on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
     write /sys/devices/virtual/goog_touch_interface/gti.0/screen_protector_mode_enabled 1
 
-# Touch
-on property:vendor.device.modules.ready=1
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/force_active
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/fw_ver
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_base
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_diff
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ms_raw
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/self_test
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_base
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_diff
-    chown system system /sys/devices/virtual/goog_touch_interface/gti.0/ss_raw
-
 # Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
 on property:sys.boot_completed=1
     trigger override-sf-uclamp

device-lynx.mk

@@ -231,8 +231,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.camera.extended_launch_boost=1 \
 	persist.vendor.camera.optimized_tnr_freq=1 \
 	persist.vendor.camera.raise_buf_allocation_priority=1 \
-	persist.vendor.camera.start_cpu_throttling_at_moderate_thermal=1 \
-	vendor.camera.multicam.enable_p23_multicam=true
+	persist.vendor.camera.start_cpu_throttling_at_moderate_thermal=1
 
 # Enable camera 1080P 60FPS binning mode
 PRODUCT_VENDOR_PROPERTIES += \