diff --git a/a10/device.mk b/a10/device.mk
index 7f3440d..6e3beb8 100644
--- a/a10/device.mk
+++ b/a10/device.mk
@@ -7,6 +7,9 @@ $(call inherit-product, vendor/samsung/a10-arm64/a10-vendor.mk)
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
+PRODUCT_PACKAGES += \
+    CameraLightSensor
+
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.a10
diff --git a/a20/device.mk b/a20/device.mk
index 984b599..f029837 100644
--- a/a20/device.mk
+++ b/a20/device.mk
@@ -10,6 +10,9 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
+PRODUCT_PACKAGES += \
+    CameraLightSensor
+    
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.3-service.samsung
diff --git a/a20e/device.mk b/a20e/device.mk
index 63c5854..17ab241 100644
--- a/a20e/device.mk
+++ b/a20e/device.mk
@@ -10,6 +10,9 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
+PRODUCT_PACKAGES += \
+    CameraLightSensor
+
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.3-service.samsung
diff --git a/a30/overlay/frameworks/base/core/res/res/values/config.xml b/a30/overlay/frameworks/base/core/res/res/values/config.xml
index a5ba879..6134038 100644
--- a/a30/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30/overlay/frameworks/base/core/res/res/values/config.xml
@@ -66,8 +66,6 @@
     <!-- For performance and storage reasons, limit the number of fingerprints per user -->
     <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
 
-    <bool name="config_automatic_brightness_available">true</bool>
-
     <!-- Specify if the fingerprint hardware support gestures-->
     <bool name="config_fingerprintSupportsGestures">true</bool>
 
diff --git a/a40/overlay/frameworks/base/core/res/res/values/config.xml b/a40/overlay/frameworks/base/core/res/res/values/config.xml
index 15870cb..6134038 100644
--- a/a40/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a40/overlay/frameworks/base/core/res/res/values/config.xml
@@ -51,8 +51,6 @@
          will not debounce light sensor readings -->
     <integer name="config_lightSensorWarmupTime">200</integer>
 
-    <bool name="config_automatic_brightness_available">true</bool>
-
     <!-- The type of the light sensor to be used by the display framework for things like
          auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
     <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</string>
diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index 9b6a1f5..fc33d70 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -188,6 +188,7 @@
          fading edges is prohibitively expensive on most GPUs. -->
     <bool name="config_ui_enableFadingMarquee">true</bool>
     
+    <bool name="config_automatic_brightness_available">true</bool>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
     <integer-array name="config_autoBrightnessDisplayValuesNits">