diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6d888997..2de54a5a 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -645,9 +645,6 @@
          auto-brightness adjustment setting. -->
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">200%</fraction>
 
-    <!-- Period of time in which to consider light samples in milliseconds. -->
-    <integer name="config_autoBrightnessAmbientLightHorizon">16000</integer>
-
     <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
           For this time after the screen turns on, the Power Manager
           will not debounce light sensor readings -->
@@ -756,6 +753,9 @@
     -->
     <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">false</bool>
 
+    <!-- Whether the display blanks itself when transitioning from a doze to a non-doze state -->
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+
     <!-- Power Management: Specifies whether to decouple the interactive state of the
          device from the display on/off state.
 
@@ -1132,9 +1132,6 @@
          rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
     <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,8388608,262144,524288,4194304</string>
 
-    <!-- dual sap mode is supported on this device. -->
-    <bool name="config_wifi_dual_sap_mode_enabled">true</bool>
-
     <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
     <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
 
diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/overlay/frameworks/base/core/res/res/values/strings.xml
index f09c165f..57f28028 100644
--- a/overlay/frameworks/base/core/res/res/values/strings.xml
+++ b/overlay/frameworks/base/core/res/res/values/strings.xml
@@ -19,6 +19,7 @@
 
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds.  Do not translate. -->
+
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Do not translate. Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default" translatable="false">Xiaomi SDM660</string>
diff --git a/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml b/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
index 74c22e82..6e52d2c6 100644
--- a/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
+++ b/overlay/frameworks/base/packages/SettingsLib/res/values/arrays.xml
@@ -18,6 +18,7 @@
 ** limitations under the License.
 */
 -->
+
 <resources>
     <!-- IDs for each color mode. The values must match the corresponding constants in
          android.view.Display -->
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index ba57e801..4168e0ec 100644
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 -->
-<resources>
 
+<resources>
     <!-- Whether Bluetooth should be switched on by default -->
     <bool name="def_bluetooth_on">false</bool>
 
@@ -27,13 +27,9 @@
     <!-- Default screen brightness, from 0 to 255. 78 is 30%. -->
     <integer name="def_screen_brightness">78</integer>
 
-    <!-- 30 seconds for default screen timeout -->
-    <integer name="def_screen_off_timeout">30000</integer>
-
     <!-- Disable UI touch sounds by default -->
     <bool name="def_sound_effects_enabled">false</bool>
 
     <!-- Disable UI touch haptic feedback by default -->
     <bool name="def_haptic_feedback">false</bool>
-
 </resources>
diff --git a/overlay/packages/apps/Bluetooth/res/values/config.xml b/overlay/packages/apps/Bluetooth/res/values/config.xml
index a1cdd788..9624f83f 100755
--- a/overlay/packages/apps/Bluetooth/res/values/config.xml
+++ b/overlay/packages/apps/Bluetooth/res/values/config.xml
@@ -29,9 +29,9 @@
      OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
+
 <resources>
     <bool name="profile_supported_avrcp_controller">true</bool>
-    <bool name="profile_supported_ba">true</bool>
     <bool name="profile_supported_hid_device">false</bool>
     <bool name="profile_supported_sap">true</bool>
 </resources>
diff --git a/overlay/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
deleted file mode 100644
index abf44c4b..00000000
--- a/overlay/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="call_recording_enabled">true</bool>
-    <integer name="call_recording_audio_source">4</integer>
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values/arrays.xml b/overlay/packages/apps/Settings/res/values/arrays.xml
index 3a00a899..705da7ca 100644
--- a/overlay/packages/apps/Settings/res/values/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values/arrays.xml
@@ -17,8 +17,8 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- IDs for each color mode. The values must match the corresponding constants in
          android.view.Display -->
     <integer-array name="color_mode_ids">
@@ -26,5 +26,4 @@
         <item>-1</item>
         <item>-1</item>
     </integer-array>
-
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 17295e84..00000000
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Enable Manual Sim Provisioning -->
-    <bool name="config_enableManualSubProvisioning">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 93fc384c..8523d216 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -21,15 +21,8 @@
 
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
+
 <resources>
-
-    <!-- Show enabled lte option for lte device -->
-    <bool name="config_enabled_lte" translatable="false">true</bool>
-
-    <!-- Show Preferred Network Type options in No SIM case -->
-    <bool name="config_no_sim_display_network_modes">true</bool>
-
     <!-- Flag indicating if hac is enabled -->
     <bool name="hac_enabled">true</bool>
-
 </resources>
diff --git a/overlay/packages/services/Telephony/res/xml/telephony_injection.xml b/overlay/packages/services/Telephony/res/xml/telephony_injection.xml
index c165d0fe..270fd1f6 100644
--- a/overlay/packages/services/Telephony/res/xml/telephony_injection.xml
+++ b/overlay/packages/services/Telephony/res/xml/telephony_injection.xml
@@ -24,6 +24,7 @@
      "/system/framework/" should be the target directory.
         e.g. "/system/framework/eg-telephony-common.jar"
 -->
+
 <injection package="com.qualcomm.qti.internal.telephony.QtiTelephonyComponentFactory"
            jar="/system/framework/qti-telephony-common.jar:/product/framework/qti-telephony-common.jar:/product/framework/qti-telephony-hidl-wrapper.jar:/product/framework/qti-telephony-utils.jar:/system/framework/qti-telephony-utils.jar">
     <components>