diff --git a/Huawei/hi3660/DUK/res/values/config.xml b/Huawei/hi3660/DUK/res/values/config.xml
index 225fb4b..2a6656b 100644
--- a/Huawei/hi3660/DUK/res/values/config.xml
+++ b/Huawei/hi3660/DUK/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi3660/STF/res/values/config.xml b/Huawei/hi3660/STF/res/values/config.xml
index 4d18c87..04dcc26 100644
--- a/Huawei/hi3660/STF/res/values/config.xml
+++ b/Huawei/hi3660/STF/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi3660/VTR/res/values/config.xml b/Huawei/hi3660/VTR/res/values/config.xml
index 4d18c87..04dcc26 100644
--- a/Huawei/hi3660/VTR/res/values/config.xml
+++ b/Huawei/hi3660/VTR/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/ANE/res/values/config.xml b/Huawei/hi6250/ANE/res/values/config.xml
index 4d18c87..04dcc26 100644
--- a/Huawei/hi6250/ANE/res/values/config.xml
+++ b/Huawei/hi6250/ANE/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/BND/res/values/config.xml b/Huawei/hi6250/BND/res/values/config.xml
index 4d18c87..04dcc26 100644
--- a/Huawei/hi6250/BND/res/values/config.xml
+++ b/Huawei/hi6250/BND/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/LLD/res/values/config.xml b/Huawei/hi6250/LLD/res/values/config.xml
index 4d18c87..04dcc26 100644
--- a/Huawei/hi6250/LLD/res/values/config.xml
+++ b/Huawei/hi6250/LLD/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/PRA/res/values/config.xml b/Huawei/hi6250/PRA/res/values/config.xml
index cc53003..629e2b9 100644
--- a/Huawei/hi6250/PRA/res/values/config.xml
+++ b/Huawei/hi6250/PRA/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/RNE/res/values/config.xml b/Huawei/hi6250/RNE/res/values/config.xml
index cc53003..629e2b9 100644
--- a/Huawei/hi6250/RNE/res/values/config.xml
+++ b/Huawei/hi6250/RNE/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/hi6250/WAS/res/values/config.xml b/Huawei/hi6250/WAS/res/values/config.xml
index cc53003..629e2b9 100644
--- a/Huawei/hi6250/WAS/res/values/config.xml
+++ b/Huawei/hi6250/WAS/res/values/config.xml
@@ -83,16 +83,6 @@
 
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
diff --git a/Huawei/msm8917/ATU/res/values/config.xml b/Huawei/msm8917/ATU/res/values/config.xml
index a228af1..44c760e 100644
--- a/Huawei/msm8917/ATU/res/values/config.xml
+++ b/Huawei/msm8917/ATU/res/values/config.xml
@@ -105,16 +105,6 @@
 	<!-- Boolean indicating if current platform supports BLE peripheral mode -->
 	<bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
 
-	<!-- ComponentName of a dream to show whenever the system would otherwise have
-	gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-	try to start this dream if possible.  The dream should typically call startDozing()
-	to put the display into a low power state and allow the application processor
-	to be suspended.  When the dream ends, the system will go to sleep as usual.
-	Specify the component name or an empty string if none.
-	Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-	Doze dreams will run whenever the power manager is in a dozing state. -->
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
-
 	<!-- If true, the doze component is not started until after the screen has been
 	turned off and the screen off animation has been performed. -->
 	<bool name="config_dozeAfterScreenOff">true</bool>
diff --git a/LG/G7/res/values/config.xml b/LG/G7/res/values/config.xml
index 98ef80a..815ef82 100644
--- a/LG/G7/res/values/config.xml
+++ b/LG/G7/res/values/config.xml
@@ -79,7 +79,6 @@
     <bool name="config_wifi_background_scan_support">false</bool>
     <bool name="config_wifi_dual_band_support">true</bool>
 
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 </resources>
diff --git a/Moto/E5/res/values/config.xml b/Moto/E5/res/values/config.xml
index 90d0f2f..17f85b2 100644
--- a/Moto/E5/res/values/config.xml
+++ b/Moto/E5/res/values/config.xml
@@ -76,7 +76,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
@@ -118,4 +117,4 @@
 		<item>/system/framework/arm/boot-core-libart.oat</item>
 		<item>/system/framework/arm/boot-core-libart.vdex</item>
 	</string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Moto/E5Plus/res/values/config.xml b/Moto/E5Plus/res/values/config.xml
index 146c39b..e05c4a3 100644
--- a/Moto/E5Plus/res/values/config.xml
+++ b/Moto/E5Plus/res/values/config.xml
@@ -77,7 +77,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
diff --git a/Moto/G6/res/values/config.xml b/Moto/G6/res/values/config.xml
index 38a03a2..021cb70 100644
--- a/Moto/G6/res/values/config.xml
+++ b/Moto/G6/res/values/config.xml
@@ -76,7 +76,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
diff --git a/Moto/G6Play/res/values/config.xml b/Moto/G6Play/res/values/config.xml
index a806fe9..d52ae26 100644
--- a/Moto/G6Play/res/values/config.xml
+++ b/Moto/G6Play/res/values/config.xml
@@ -76,7 +76,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
diff --git a/Moto/G6Plus/res/values/config.xml b/Moto/G6Plus/res/values/config.xml
index 8ca34b7..a2f06ee 100644
--- a/Moto/G6Plus/res/values/config.xml
+++ b/Moto/G6Plus/res/values/config.xml
@@ -77,7 +77,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
diff --git a/Moto/G7Play/res/values/config.xml b/Moto/G7Play/res/values/config.xml
index 740b614..754192f 100644
--- a/Moto/G7Play/res/values/config.xml
+++ b/Moto/G7Play/res/values/config.xml
@@ -89,7 +89,6 @@
         <item>26</item>
     </integer-array>
     <string name="config_cameraLaunchGestureSensorStringType">com.motorola.sensor.camera_activate</string>
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <string name="config_ims_package">org.codeaurora.ims</string>
     <string name="config_mainBuiltInDisplayCutout">M -188,0 L -188,72 L 188,72 L 188,0 Z</string>
     <string-array name="config_gpsParameters">
diff --git a/Moto/G7Power/res/values/config.xml b/Moto/G7Power/res/values/config.xml
index d503807..140c4de 100644
--- a/Moto/G7Power/res/values/config.xml
+++ b/Moto/G7Power/res/values/config.xml
@@ -66,7 +66,6 @@
 	<bool name="skip_restoring_network_selection">true</bool>
 	<bool name="config_showNavigationBar">true</bool>
 
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 	<bool name="config_dozeAfterScreenOff">true</bool>
 	<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
 	<bool name="config_cellBroadcastAppLinks">true</bool>
diff --git a/Nubia/Z18mini/res/values/config.xml b/Nubia/Z18mini/res/values/config.xml
index e8603ee..c75ef2e 100644
--- a/Nubia/Z18mini/res/values/config.xml
+++ b/Nubia/Z18mini/res/values/config.xml
@@ -57,7 +57,6 @@
     <integer name="config_shutdownBatteryTemperature">680</integer>
 
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <bool name="config_dozeAfterScreenOff">true</bool>
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
 </resources>
diff --git a/OnePlus/OP6/res/values/config.xml b/OnePlus/OP6/res/values/config.xml
index e8b9ad7..9d99945 100644
--- a/OnePlus/OP6/res/values/config.xml
+++ b/OnePlus/OP6/res/values/config.xml
@@ -64,7 +64,6 @@
     <bool name="config_wifi_background_scan_support">true</bool>
     <bool name="config_wifi_dual_band_support">true</bool>
 
-    <!--<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
-    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <!--<bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>-->
 </resources>
diff --git a/Samsung/S10e/res/values/doze.xml b/Samsung/S10e/res/values/doze.xml
index e00baf1..8d49788 100644
--- a/Samsung/S10e/res/values/doze.xml
+++ b/Samsung/S10e/res/values/doze.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <resources>
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <bool name="config_enableBurnInProtection">true</bool>
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
 </resources>
diff --git a/Xiaomi/MiMix3/res/values/config.xml b/Xiaomi/MiMix3/res/values/config.xml
index 1cef869..dbbb772 100644
--- a/Xiaomi/MiMix3/res/values/config.xml
+++ b/Xiaomi/MiMix3/res/values/config.xml
@@ -836,7 +836,6 @@
     <bool name="config_device_volte_available">true</bool>
     <bool name="config_device_vt_available">true</bool>
 
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <bool name="config_displayBlanksAfterDoze">false</bool>
     <bool name="config_dozeAfterScreenOff">true</bool>
     <bool name="config_dozeAfterScreenOffByDefault">true</bool>
diff --git a/Xiaomi/RedmiGo/res/values/config.xml b/Xiaomi/RedmiGo/res/values/config.xml
index 25c2a8d..3a6aa60 100644
--- a/Xiaomi/RedmiGo/res/values/config.xml
+++ b/Xiaomi/RedmiGo/res/values/config.xml
@@ -154,15 +154,6 @@
     <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
     <!-- Operating volatage for bluetooth controller. 0 by default-->
     <integer translatable="false" name="config_bluetooth_operating_voltage_mv">3300</integer>
-    <!-- ComponentName of a dream to show whenever the system would otherwise have
-         gone to sleep.  When the PowerManager is asked to go to sleep, it will instead
-         try to start this dream if possible.  The dream should typically call startDozing()
-         to put the display into a low power state and allow the application processor
-         to be suspended.  When the dream ends, the system will go to sleep as usual.
-         Specify the component name or an empty string if none.
-         Note that doze dreams are not subject to the same start conditions as ordinary dreams.
-         Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent" translatable="false">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOff">true</bool>
diff --git a/tests/knownKeys b/tests/knownKeys
index 17d688e..ffaff64 100644
--- a/tests/knownKeys
+++ b/tests/knownKeys
@@ -34,7 +34,6 @@ config_displayBlanksAfterDoze
 config_doublePressOnPowerBehavior
 config_dozeAfterScreenOffByDefault
 config_dozeAlwaysOnDisplayAvailable
-config_dozeComponent
 config_dynamic_bind_ims
 config_enableAutoPowerModes
 config_enableMultiUserUI