diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e14cba7f903..bbb8eea9700 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2911,15 +2911,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="UsageStatsActivity"
-                  android:exported="true"
-                  android:label="@string/usage_stats_label">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:name="Settings$PowerUsageSummaryActivity"
             android:label="@string/power_usage_summary_title"
@@ -4584,8 +4575,23 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".spa.SpaActivity" android:exported="false"/>
+        <activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>
+
+        <activity-alias android:name="UsageStatsActivity"
+                        android:exported="true"
+                        android:label="@string/testing_usage_stats"
+                        android:targetActivity=".spa.SpaBridgeActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.spa.DESTINATION"
+                       android:value="UsageStats"/>
+        </activity-alias>
+
         <activity
-            android:name="com.android.settings.spa.SpaActivity"
+            android:name="com.android.settings.spa.SpaDebugActivity"
             android:exported="false">
         </activity>
 
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 2b36137d8f6..684a038dc85 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -3117,22 +3117,6 @@
             column="13"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/accessibility_feature_background&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_screen_zoom.xml"
-            line="22"
-            column="13"/>
-    </issue>
-
     <issue
         id="HardCodedColor"
         severity="Error"
@@ -3741,38 +3725,6 @@
             column="15"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="          &lt;item android:offset=&quot;0&quot; android:color=&quot;#FF4285F4&quot;/>"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/one_handed_guideline.xml"
-            line="34"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="          &lt;item android:offset=&quot;1&quot; android:color=&quot;#004385F5&quot;/>"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/one_handed_guideline.xml"
-            line="35"
-            column="36"/>
-    </issue>
-
     <issue
         id="HardCodedColor"
         severity="Error"
diff --git a/res/color/storage_wizard_button.xml b/res/color/storage_wizard_button.xml
deleted file mode 100644
index 38c7d523ea1..00000000000
--- a/res/color/storage_wizard_button.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-          android:alpha="?android:attr/disabledAlpha"
-          android:color="?android:attr/colorAccent" />
-    <item android:color="?android:attr/colorAccent" />
-</selector>
diff --git a/res/drawable/ic_fingerprint_introduction_shield_24dp.xml b/res/drawable/ic_fingerprint_introduction_shield_24dp.xml
deleted file mode 100644
index 28c998471e9..00000000000
--- a/res/drawable/ic_fingerprint_introduction_shield_24dp.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-  Copyright (C) 2021 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.
--->
-
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-                 xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
-                android:viewportWidth="24"
-                android:tint="?android:attr/colorControlNormal">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_0_G">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M12 2 C12,2 3.82,5.64 3.82,5.64 C3.82,5.64 3.82,11.09 3.82,11.09 C3.82,16.14 7.31,20.85 12,22 C16.69,20.85 20.18,16.14 20.18,11.09 C20.18,11.09 20.18,5.64 20.18,5.64 C20.18,5.64 12,2 12,2c  M18.18 11.09 C18.18,12.64 17.77,14.14 17.08,15.47 C15.77,14.5 13.4,14 12,14 C10.6,14 8.23,14.5 6.92,15.47 C6.23,14.14 5.82,12.64 5.82,11.09 C5.82,11.09 5.82,6.94 5.82,6.94 C5.82,6.94 12,4.19 12,4.19 C12,4.19 18.18,6.94 18.18,6.94 C18.18,6.94 18.18,11.09 18.18,11.09c "/>
-                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="#000000"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M12 7.5 C13.66,7.5 15,8.84 15,10.5 C15,12.16 13.66,13.5 12,13.5 C10.34,13.5 9,12.16 9,10.5 C9,8.84 10.34,7.5 12,7.5c "/>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="2000"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_list_icon.xml b/res/drawable/ic_fingerprint_list_icon.xml
deleted file mode 100644
index 6a563aa9d82..00000000000
--- a/res/drawable/ic_fingerprint_list_icon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-    Copyright (C) 2016 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
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?attr/sudListItemIconColor"
-        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"/>
-</vector>
diff --git a/res/drawable/ic_fingerprint_success.xml b/res/drawable/ic_fingerprint_success.xml
deleted file mode 100644
index e800fae86dc..00000000000
--- a/res/drawable/ic_fingerprint_success.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32.0dp"
-        android:height="32.0dp"
-        android:viewportWidth="40.0"
-        android:viewportHeight="40.0">
-    <path
-        android:pathData="M20.0,20.0m-20.0,0.0a20.0,20.0 0.0,1.0 1.0,40.0 0.0a20.0,20.0 0.0,1.0 1.0,-40.0 0.0"
-        android:fillColor="?android:attr/colorAccent"/>
-    <path
-        android:pathData="M11.2,21.41l1.63,-1.619999 4.17,4.169998 10.59,-10.589999 1.619999,1.63 -12.209999,12.209999z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_package_verifier_disabled.xml b/res/drawable/ic_package_verifier_disabled.xml
deleted file mode 100644
index 49fe0d33ae6..00000000000
--- a/res/drawable/ic_package_verifier_disabled.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFEF6C00"
-        android:pathData="M12,4.24l6,3v4.1c0,3.9 -2.55,7.5 -6,8.59c-3.45,-1.09 -6,-4.7 -6,-8.59v-4.1L12,4.24M12,2L4,6v5.33c0,4.93 3.41,9.55 8,10.67c4.59,-1.12 8,-5.73 8,-10.67V6L12,2L12,2zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/>
-</vector>
diff --git a/res/drawable/ic_package_verifier_enabled.xml b/res/drawable/ic_package_verifier_enabled.xml
deleted file mode 100644
index 1e09eee9b15..00000000000
--- a/res/drawable/ic_package_verifier_enabled.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FF43A047"
-        android:pathData="M11.14,16l-3.84,-3.84l1.41,-1.42l2.43,2.42l4.16,-4.16l1.42,1.41L11.14,16zM12,4.24l6,3v4.1c0,3.9 -2.55,7.5 -6,8.59c-3.45,-1.09 -6,-4.7 -6,-8.59v-4.1L12,4.24M12,2L4,6v5.33c0,4.93 3.41,9.55 8,10.67c4.59,-1.12 8,-5.73 8,-10.67V6L12,2L12,2z"/>
-</vector>
diff --git a/res/drawable/ic_package_verifier_removed.xml b/res/drawable/ic_package_verifier_removed.xml
deleted file mode 100644
index d3680e70924..00000000000
--- a/res/drawable/ic_package_verifier_removed.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFF44336"
-        android:pathData="M15.5,9.91L14.09,8.5L12,10.59L9.91,8.5L8.5,9.91L10.59,12L8.5,14.09l1.41,1.41L12,13.42l2.09,2.08l1.41,-1.41L13.42,12L15.5,9.91zM12,4.24l6,3v4.1c0,3.9 -2.55,7.5 -6,8.59c-3.45,-1.09 -6,-4.7 -6,-8.59v-4.1L12,4.24M12,2L4,6v5.33c0,4.93 3.41,9.55 8,10.67c4.59,-1.12 8,-5.73 8,-10.67V6L12,2L12,2z"/>
-</vector>
diff --git a/res/drawable/ic_partial_system_update_current.xml b/res/drawable/ic_partial_system_update_current.xml
deleted file mode 100644
index 6e16592a4f1..00000000000
--- a/res/drawable/ic_partial_system_update_current.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Copyright (C) 2019 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-<path
-    android:fillColor="#FF1E8E3E"
-    android:pathData="M17,18H7v-2.67l1.59,1.58L10,15.5l-3,-3l-1,-1l-4,4l1.41,1.42L5,15.33v4.17V20v1c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-7h-2V18zM17,21H7v-1h10V21z"/>
-<path
-    android:fillColor="#FF1E8E3E"
-    android:pathData="M7,6h10v2.67l-1.59,-1.58L14,8.5l4,4l4,-4l-1.41,-1.42L19,8.67V4.5V4V3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1C5.9,1 5,1.9 5,3v7h2V6zM7,3h10v1H7V3z"/>
-</vector>
diff --git a/res/drawable/ic_partial_system_update_stale.xml b/res/drawable/ic_partial_system_update_stale.xml
deleted file mode 100644
index 905187c1058..00000000000
--- a/res/drawable/ic_partial_system_update_stale.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Copyright (C) 2019 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-<path
-    android:fillColor="#FFD93025"
-    android:pathData="M17,18H7v-2.67l1.59,1.58L10,15.5l-3,-3l-1,-1l-4,4l1.41,1.42L5,15.33v4.17V20v1c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-7h-2V18zM17,21H7v-1h10V21z"/>
-<path
-    android:fillColor="#FFD93025"
-    android:pathData="M7,6h10v2.67l-1.59,-1.58L14,8.5l4,4l4,-4l-1.41,-1.42L19,8.67V4.5V4V3c0,-1.1 -0.9,-1.99 -2,-1.99L7,1C5.9,1 5,1.9 5,3v7h2V6zM7,3h10v1H7V3z"/>
-</vector>
diff --git a/res/drawable/ic_screen_zoom.xml b/res/drawable/ic_screen_zoom.xml
deleted file mode 100644
index 2be1dceec34..00000000000
--- a/res/drawable/ic_screen_zoom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  Copyright 2021 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <com.android.settingslib.widget.AdaptiveIconShapeDrawable
-            android:width="@dimen/accessibility_icon_size"
-            android:height="@dimen/accessibility_icon_size"
-            android:color="@color/accessibility_feature_background"/>
-    </item>
-    <item android:gravity="center">
-        <vector
-            android:width="@dimen/accessibility_icon_foreground_size"
-            android:height="@dimen/accessibility_icon_foreground_size"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="#ffffff"
-                android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,21L7,21v-1h10v1zM17,18L7,18L7,6h10v12zM17,4L7,4L7,3h10v1zM9.5,8.5L12,8.5L12,7L8,7v4h1.5zM12,17h4v-4h-1.5v2.5L12,15.5z"/>
-        </vector>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml
deleted file mode 100644
index 4f13530918b..00000000000
--- a/res/drawable/ic_settings_about.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,7h2v2h-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,11h2v6h-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
-</vector>
diff --git a/res/drawable/ic_settings_backup_restore.xml b/res/drawable/ic_settings_backup_restore.xml
deleted file mode 100644
index 245b0fcc855..00000000000
--- a/res/drawable/ic_settings_backup_restore.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
deleted file mode 100644
index 6afc5d03b3d..00000000000
--- a/res/drawable/ic_settings_battery.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
-</vector>
diff --git a/res/drawable/ic_settings_cell_standby.xml b/res/drawable/ic_settings_cell_standby.xml
deleted file mode 100644
index 5a9a300f021..00000000000
--- a/res/drawable/ic_settings_cell_standby.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2019 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="m11.986,12.0357c5.4299,-5.4312 9.9013,-9.875 9.9363,-9.875 0.035,0 0.0637,4.4437 0.0637,9.875v9.875L12.0497,21.9107 2.1134,21.9107ZM19.986,13.3522L19.986,6.7936l-3,2.9922 -3,2.9922v3.5664,3.5664h3,3z"
-        android:strokeWidth="0.25"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_settings_widget_background.xml b/res/drawable/ic_settings_widget_background.xml
deleted file mode 100644
index 6d81d47c710..00000000000
--- a/res/drawable/ic_settings_widget_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:viewportWidth="192"
-        android:viewportHeight="192"
-        android:width="72dp"
-        android:height="72dp">
-    <path
-        android:pathData="M184 96A88 88 0 0 1 96 184 88 88 0 0 1 8 96 88 88 0 0 1 96 8 88 88 0 0 1 184 96Z"
-        android:fillColor="@android:color/white" />
-</vector>
diff --git a/res/drawable/ic_speaker_group_black_24dp.xml b/res/drawable/ic_speaker_group_black_24dp.xml
deleted file mode 100644
index ae0d56217fd..00000000000
--- a/res/drawable/ic_speaker_group_black_24dp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  Copyright (C) 2020 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
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:pathData="M18.2,1L9.8,1C8.81,1 8,1.81 8,2.8v14.4c0,0.99 0.81,1.79 1.8,1.79l8.4,0.01c0.99,0 1.8,-0.81 1.8,-1.8L20,2.8c0,-0.99 -0.81,-1.8 -1.8,-1.8zM14,3c1.1,0 2,0.89 2,2s-0.9,2 -2,2 -2,-0.89 -2,-2 0.9,-2 2,-2zM14,16.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M14,12.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M6,5H4v16c0,1.1 0.89,2 2,2h10v-2H6V5z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml
deleted file mode 100644
index 4df035c39be..00000000000
--- a/res/drawable/ic_translate_24dp.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  Copyright (C) 2017 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
-</vector>
diff --git a/res/drawable/one_handed_guideline.xml b/res/drawable/one_handed_guideline.xml
deleted file mode 100644
index 2c1a15834e5..00000000000
--- a/res/drawable/one_handed_guideline.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="412dp"
-    android:height="264dp"
-    android:viewportWidth="412"
-    android:viewportHeight="264">
-  <group>
-    <clip-path
-        android:pathData="M0,0h412v264h-412z"/>
-    <path
-        android:pathData="M126,-246C109.431,-246 96,-232.569 96,-216V195C96,211.569 109.431,225 126,225H284.5C301.069,225 314.5,211.569 314.5,195V-216C314.5,-232.569 301.069,-246 284.5,-246H126ZM122,-235C110.954,-235 102,-226.046 102,-215V189.5C102,200.546 110.954,209.5 122,209.5H288C299.046,209.5 308,200.546 308,189.5V-215C308,-226.046 299.046,-235 288,-235H122Z"
-        android:fillColor="#000000"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M122.12,-233L288.12,-233A20,20 0,0 1,308.12 -213L308.12,191.5A20,20 0,0 1,288.12 211.5L122.12,211.5A20,20 0,0 1,102.12 191.5L102.12,-213A20,20 0,0 1,122.12 -233z"
-        android:fillColor="#EAF1FF"/>
-    <path
-        android:pathData="M102.16,193.12H308.08C308.08,203.326 299.806,211.6 289.6,211.6H120.64C110.434,211.6 102.16,203.326 102.16,193.12Z"
-        android:fillColor="#B5CFFC"/>
-    <path
-        android:pathData="M187.5,202.72L222.5,202.72A0.5,0.5 0,0 1,223 203.22L223,203.22A0.5,0.5 0,0 1,222.5 203.72L187.5,203.72A0.5,0.5 0,0 1,187 203.22L187,203.22A0.5,0.5 0,0 1,187.5 202.72z"
-        android:fillColor="#666666"/>
-    <path
-        android:pathData="M197,115h36v94.684h-36z"
-        android:strokeAlpha="0.8"
-        android:fillAlpha="0.8">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="189.19"
-            android:startX="212.951"
-            android:endY="168.637"
-            android:endX="212.447"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF4285F4"/>
-          <item android:offset="1" android:color="#004385F5"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="M197,206.899a18,18.101 0,1 0,36 0a18,18.101 0,1 0,-36 0z"
-        android:strokeAlpha="0.8"
-        android:fillColor="#3B7BE4"
-        android:fillAlpha="0.8"/>
-  </group>
-</vector>
diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml
deleted file mode 100644
index 9c1987731b9..00000000000
--- a/res/drawable/selectable_card.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?android:attr/colorBackground"/>
-</ripple>
diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml
deleted file mode 100644
index a58f2e9f2f1..00000000000
--- a/res/drawable/switchbar_background.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="?android:attr/colorSecondary" />
-</ripple>
-
diff --git a/res/drawable/tabs_indicator_background.xml b/res/drawable/tabs_indicator_background.xml
deleted file mode 100644
index d326e650fe2..00000000000
--- a/res/drawable/tabs_indicator_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2021 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.
--->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="?android:attr/textColorSecondaryInverse"/>
-    <corners android:radius="8dp"/>
-    <size android:height="4dp"/>
-</shape>
diff --git a/res/layout/one_handed_header.xml b/res/layout/one_handed_header.xml
deleted file mode 100644
index 3fa81837985..00000000000
--- a/res/layout/one_handed_header.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="centerInside"
-        android:cropToPadding="true"
-        android:src="@drawable/one_handed_guideline"
-        android:contentDescription="@null" />
-
-</FrameLayout>
diff --git a/res/layout/palette_listview_item.xml b/res/layout/palette_listview_item.xml
deleted file mode 100644
index 012e740ae3a..00000000000
--- a/res/layout/palette_listview_item.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2020 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
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/item_textview"
-        android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
-        android:gravity="center_vertical"
-        android:maxLength="20"
-        android:paddingLeft="@dimen/accessibility_layout_margin_start_end"
-        android:singleLine="true"
-        android:textSize="14sp" />
-
-</FrameLayout>
diff --git a/res/layout/preference_multiline_title.xml b/res/layout/preference_multiline_title.xml
deleted file mode 100644
index 9612a577835..00000000000
--- a/res/layout/preference_multiline_title.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground">
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="16dip"
-        android:paddingBottom="16dip">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textAlignment="center"
-            android:ellipsize="marquee"
-            android:hyphenationFrequency="normalFast"
-            android:lineBreakWordStyle="phrase"
-            android:fadingEdge="horizontal" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
-            android:visibility="gone"
-            android:textAlignment="viewStart"
-            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-            android:textColor="?android:attr/textColorSecondary"
-            android:hyphenationFrequency="normalFast"
-            android:lineBreakWordStyle="phrase"
-            android:maxLines="10" />
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/preference_two_target_radio.xml b/res/layout/preference_two_target_radio.xml
deleted file mode 100644
index ece07464f52..00000000000
--- a/res/layout/preference_two_target_radio.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:background="@android:color/transparent"
-    android:clipToPadding="false">
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
-        android:gravity="start|center_vertical"
-        android:clipToPadding="false">
-
-        <LinearLayout
-            android:id="@+id/checkbox_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:minWidth="56dp"
-            android:layout_marginEnd="16dp"
-            android:orientation="vertical">
-            <RadioButton
-                android:id="@android:id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@null"
-                android:focusable="false"
-                android:clickable="false" />
-        </LinearLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:paddingEnd="16dp">
-
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceListItem"
-                android:ellipsize="marquee" />
-
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
-                android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-                android:textColor="?android:attr/textColorSecondary"
-                android:hyphenationFrequency="normalFast"
-                android:lineBreakWordStyle="phrase"
-                android:maxLines="10" />
-
-        </RelativeLayout>
-    </LinearLayout>
-
-    <include layout="@layout/preference_two_target_divider" />
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:minWidth="@dimen/two_target_min_width"
-        android:orientation="vertical" />
-
-</LinearLayout>
diff --git a/res/layout/preference_widget_gear_no_bg.xml b/res/layout/preference_widget_gear_no_bg.xml
deleted file mode 100644
index 6a26fc8a979..00000000000
--- a/res/layout/preference_widget_gear_no_bg.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<!-- Settings button -->
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/settings_button"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:scaleType="center"
-    android:src="@drawable/ic_settings_accent"
-    android:contentDescription="@string/settings_button" />
-
diff --git a/res/layout/radio_list_container.xml b/res/layout/radio_list_container.xml
deleted file mode 100644
index bf40abe6f52..00000000000
--- a/res/layout/radio_list_container.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="4dp"
-    android:orientation="vertical" />
diff --git a/res/layout/remember_dock_setting.xml b/res/layout/remember_dock_setting.xml
deleted file mode 100644
index 023a9122cc7..00000000000
--- a/res/layout/remember_dock_setting.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<CheckBox
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/remember"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/bluetooth_dock_settings_remember"
-    android:focusable="true"
-    android:clickable="true" />
diff --git a/res/layout/setup_screen_lock_fingerprint_details.xml b/res/layout/setup_screen_lock_fingerprint_details.xml
deleted file mode 100644
index fc4ed986f59..00000000000
--- a/res/layout/setup_screen_lock_fingerprint_details.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="6dip"
-    android:paddingBottom="6dip"
-    android:paddingStart="@dimen/sud_layout_margin_sides"
-    android:paddingEnd="@dimen/sud_layout_margin_sides"
-    android:text="@string/unlock_setup_wizard_fingerprint_details" />
diff --git a/res/layout/styled_switch_bar.xml b/res/layout/styled_switch_bar.xml
deleted file mode 100644
index 3baaac39610..00000000000
--- a/res/layout/styled_switch_bar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<!-- For use in a LayoutPreference -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_height="wrap_content"
-              android:layout_width="match_parent" >
-
-    <com.android.settings.widget.SwitchBar
-        android:id="@+id/switch_bar"
-        android:minHeight="?android:attr/actionBarSize"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:paddingStart="0dp"
-        android:theme="?attr/switchBarTheme" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/tab_widget.xml b/res/layout/tab_widget.xml
deleted file mode 100644
index a6adc5d72a0..00000000000
--- a/res/layout/tab_widget.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none"
-    android:fillViewport="true">
-
-    <TabWidget
-        android:id="@android:id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        style="?android:attr/tabWidgetStyle" />
-
-</HorizontalScrollView>
diff --git a/res/layout/time_zone_list_item.xml b/res/layout/time_zone_list_item.xml
deleted file mode 100644
index 471c9d85a50..00000000000
--- a/res/layout/time_zone_list_item.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <TextView
-        android:id="@+id/tz_item_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="TimeZone name"
-        android:textAppearance="?android:attr/textAppearanceListItem" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tz_item_details"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
-
-        <TextView
-            android:id="@+id/tz_item_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewEnd"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/tz_item_dst"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-        android:textColor="?android:attr/textColorSecondary" />
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/trust_agent_item.xml b/res/layout/trust_agent_item.xml
deleted file mode 100644
index 3555775e086..00000000000
--- a/res/layout/trust_agent_item.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:gravity="center_vertical">
-
-    <LinearLayout
-            android:id="@+id/clickable"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?android:attr/selectableItemBackground">
-
-        <CheckBox
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:focusable="false"
-                android:clickable="false"/>
-
-        <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="6dip"
-                android:layout_marginTop="6dip"
-                android:layout_marginBottom="6dip"
-                android:layout_weight="1">
-
-            <TextView
-                    android:id="@+id/name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:ellipsize="marquee"
-                    android:fadingEdge="horizontal"/>
-
-            <TextView
-                    android:id="@+id/description"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@android:id/title"
-                    android:layout_alignStart="@android:id/title"
-                    android:paddingBottom="3dip"
-                    android:visibility="gone"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="13sp"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:focusable="false"
-                    android:maxLines="4"/>
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
deleted file mode 100644
index c8c16f73bea..00000000000
--- a/res/layout/trusted_credential_details.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<Button
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/cert_remove_button"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_gravity="end"
-    android:layout_margin="6dip"
-    />
diff --git a/res/layout/twelve_key_entry.xml b/res/layout/twelve_key_entry.xml
deleted file mode 100644
index e1d3172aabe..00000000000
--- a/res/layout/twelve_key_entry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2008, 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.
-*/
--->
-
-<!-- This is not a standalone element it can be included into apps that need 12-key input -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="64dip"
-        android:layout_marginStart="2dip"
-        android:layout_marginEnd="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/one"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/two"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/three"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-        
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="64dip"
-        android:layout_marginStart="2dip"
-        android:layout_marginEnd="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/four"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/five"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/six"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="64dip"
-        android:layout_marginStart="2dip"
-        android:layout_marginEnd="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/seven"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/eight"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/nine"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-        
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="64dip"
-        android:layout_marginStart="2dip"
-        android:layout_marginEnd="2dip"
-        android:orientation="horizontal">
-
-        <Button android:id="@+id/ok"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/ok"
-        />
-
-        <Button android:id="@+id/zero"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textStyle="bold"
-        />
-
-        <Button android:id="@+id/cancel"
-            android:layout_width="0sp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:layout_marginStart="2dip"
-            android:layout_marginEnd="2dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:text="@android:string/cancel"
-        />
-        
-    </LinearLayout>
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/twilight_mode_location_off.xml b/res/layout/twilight_mode_location_off.xml
deleted file mode 100644
index da3aa4ceca0..00000000000
--- a/res/layout/twilight_mode_location_off.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/request_background_location_permission"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:paddingStart="8dp"
-        android:paddingEnd="10dp"
-        android:paddingTop="18dp"
-        android:paddingBottom="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings_location"
-            android:tint="?android:attr/colorAccent"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:paddingRight="2dp"
-            android:gravity="center_vertical"
-            android:text="@string/twilight_mode_location_off_dialog_message"
-            android:textAppearance="?attr/textAppearanceSubtitle1"
-            android:textSize="16sp"
-            android:textColor="?android:attr/textColorPrimary"/>
-
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/go_to_location_setting"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/twilight_mode_launch_location"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
-        android:layout_gravity="end"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/usage_bottom_label.xml b/res/layout/usage_bottom_label.xml
deleted file mode 100644
index 6c168806338..00000000000
--- a/res/layout/usage_bottom_label.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-    Copyright (C) 2016 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.
--->
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
deleted file mode 100755
index 013bcdb07a5..00000000000
--- a/res/layout/usage_stats.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:text="@string/display_order_text"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <Spinner
-        android:id="@+id/typeSpinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:entries="@array/usage_stats_display_order_types" />
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" > 
-        <TextView
-            android:text="@string/app_name_label"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:paddingEnd="6dip"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:text="@string/last_time_used_label"
-            android:paddingEnd="6dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:text="@string/usage_time_label"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-    <ListView android:id="@+id/pkg_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false" />
-</LinearLayout>
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
deleted file mode 100755
index 2879df072e5..00000000000
--- a/res/layout/usage_stats_item.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2008, 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.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:minHeight="?android:attr/listPreferredItemHeight">
-
-    <TextView android:id="@+id/package_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
-
-    <TextView android:id="@+id/last_time_used"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
-
-    <TextView android:id="@+id/usage_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingEnd="6dip"
-        android:paddingStart="12dip"
-        android:maxLines="1" />
-</LinearLayout>
-
diff --git a/res/layout/vpn_lockdown_editor.xml b/res/layout/vpn_lockdown_editor.xml
deleted file mode 100644
index 933c5ec61a6..00000000000
--- a/res/layout/vpn_lockdown_editor.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        android:paddingTop="8dip"
-        android:paddingBottom="8dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/vpn_lockdown_summary" />
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-</LinearLayout>
diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
deleted file mode 100644
index 6c51d11e02a..00000000000
--- a/res/layout/wifi_network_details_two_buttons_panel.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<!--
-  Defines a panel with two buttons and a spacer in between.
-  The right button uses the Material.Button.Colored style.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp">
-        <Button
-            android:id="@+id/forget_button"
-            android:text="@string/forget"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
-        <Button
-            style="@android:style/Widget.Material.Button.Colored"
-            android:id="@+id/signin_button"
-            android:text="@string/wifi_sign_in_button_text"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
-</LinearLayout>
diff --git a/res/layout/wifi_notify_scan_mode.xml b/res/layout/wifi_notify_scan_mode.xml
deleted file mode 100644
index e9696d70dfb..00000000000
--- a/res/layout/wifi_notify_scan_mode.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-
-    <CheckBox
-        android:id="@+id/checkbox"
-        style="?android:attr/textAppearanceMedium"
-        android:text="@string/wifi_scan_notify_remember_choice"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp" />
-</FrameLayout>
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
deleted file mode 100644
index 3ef7e258faf..00000000000
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Based on simple_list_item_1.xml in framework -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textSize="20sp"
-    android:gravity="center_vertical"
-    android:paddingStart="16dip"
-    android:minHeight="48dip"
-/>
diff --git a/res/layout/write_wifi_config_to_nfc.xml b/res/layout/write_wifi_config_to_nfc.xml
deleted file mode 100644
index 3c39ad1b03e..00000000000
--- a/res/layout/write_wifi_config_to_nfc.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fadeScrollbars="false"
-        android:scrollIndicators="top|bottom">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/wifi_section">
-
-        <LinearLayout android:id="@+id/password_layout"
-                      style="@style/wifi_item"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:padding="8dip"
-                      android:orientation="vertical" >
-
-            <TextView
-                    android:id="@+id/password_label"
-                    style="?android:attr/textAppearanceSmall"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dip"
-                    android:text="@string/wifi_password" />
-
-            <EditText android:id="@+id/password"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:singleLine="true"
-                      android:password="true"
-                      android:maxLength="63"
-                      android:imeOptions="flagForceAscii" />
-            <TextView
-                    style="@style/wifi_item_label"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            <CheckBox android:id="@+id/show_password"
-                      style="@style/wifi_item_content"
-                      android:textSize="14sp"
-                      android:text="@string/wifi_show_password"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-
-        <ProgressBar
-                android:id="@+id/progress_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:padding="8dip"
-                android:visibility="gone"
-                style="@android:style/Widget.ProgressBar.Large" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/zen_mode_button.xml b/res/layout/zen_mode_button.xml
deleted file mode 100644
index af24fce6682..00000000000
--- a/res/layout/zen_mode_button.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:gravity="bottom"
-    android:paddingTop="4dp"
-    android:paddingStart="72dp"
-    android:paddingEnd="72dp"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/zen_mode_button"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/zen_rule_widget.xml b/res/layout/zen_rule_widget.xml
deleted file mode 100644
index 3d754697ba8..00000000000
--- a/res/layout/zen_rule_widget.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-    <include layout="@layout/preference_widget_gear"
-             android:id="@+id/zen_automatic_rule_widget" />
-</LinearLayout>
diff --git a/res/menu/wifi_setup.xml b/res/menu/wifi_setup.xml
deleted file mode 100644
index 91d551620b4..00000000000
--- a/res/menu/wifi_setup.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/wifi_wps"
-        android:title="@string/wifi_setup_wps" />
-</menu>
diff --git a/res/menu/zen_mode_rule.xml b/res/menu/zen_mode_rule.xml
deleted file mode 100644
index eea30a8ea95..00000000000
--- a/res/menu/zen_mode_rule.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/delete"
-        android:title="@string/zen_mode_delete_rule"
-        android:icon="@drawable/ic_delete"
-        android:visible="true"
-        android:showAsAction="collapseActionView|ifRoom" />
-</menu>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 53acc14f4af..35d246236f7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -261,13 +261,6 @@
         <item>Excellent</item>
     </string-array>
 
-    <!-- Display options for UsageStats class -->
-    <string-array name="usage_stats_display_order_types">
-        <item>Usage time</item>
-        <item>Last time used</item>
-        <item>App name</item>
-    </string-array>
-
     <!-- Phase 2 options for PEAP -->
     <string-array name="wifi_peap_phase2_entries">
         <item>MSCHAPV2</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f005901e7c9..8bdf8bd74d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,8 +47,6 @@
     <string name="dev_settings_disabled_warning">Please enable developer options first.</string>
 
     <!-- Category headings in left-pane header menu --> <skip />
-    <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
-    <string name="header_category_wireless_networks">Wireless &amp; networks</string>
     <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
     <string name="header_category_system">System</string>
 
@@ -57,8 +55,6 @@
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_service_out">Out of Service</string>
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radioInfo_service_emergency">Emergency Calls Only</string>
-    <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_service_off">Radio Off</string>
 
     <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -80,8 +76,6 @@
 
     <!-- Content description for preview pager. [CHAR LIMIT=NONE] -->
     <string name="preview_pager_content_description">Preview</string>
-    <!-- Content description for dot pager indicator for preview pager. [CHAR LIMIT=NONE] -->
-    <string name="preview_page_indicator_content_description">Preview, page <xliff:g id="current_page" example="3">%1$d</xliff:g> of <xliff:g id="num_pages" example="9">%2$d</xliff:g></string>
 
     <!-- Description for the button that makes interface elements smaller. [CHAR_LIMIT=NONE] -->
     <string name="font_size_make_smaller_desc">Make smaller</string>
@@ -276,8 +270,6 @@
     <string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
     <!-- Title for other connection preferences [CHAR LIMIT=none]-->
     <string name="connected_device_connections_title">Connection preferences</string>
-    <!-- Title for Bluetooth preference to open paired but no connection list [CHAR LIMIT=none]-->
-    <string name="connected_device_previously_connected_title">Previously connected devices</string>
     <!-- Preference screen title for Bluetooth preference to open paired but no connection list [CHAR LIMIT=none]-->
     <string name="connected_device_previously_connected_screen_title">Previously connected</string>
     <!-- Toast text for hint user bluetooth is turned on [CHAR LIMIT=none]-->
@@ -288,21 +280,6 @@
 
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time</string>
-    <!-- The title of the activity to pick a time zone. -->
-    <string name="choose_timezone">Choose time zone</string>
-
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_data_label"><xliff:g id="data">Data:</xliff:g></string>
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_sendbroadcast_text">Send <xliff:g id="broadcast">broadcast</xliff:g></string>
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_action_label"><xliff:g id="action">Action</xliff:g>:</string>
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_startactivity_text">Start <xliff:g id="activity">activity</xliff:g></string>
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_resource_label"><xliff:g id="resource">Resource</xliff:g>: </string>
-    <!-- Used for diagnostic screens, precise translation is not necessary -->
-    <string name="intent_sender_account_label">Account: </string>
 
     <!-- HTTP proxy settings title -->
     <string name="proxy_settings_title">Proxy</string>
@@ -341,8 +318,6 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_ping_hostname_v4">Ping Hostname(www.google.com) IPv4:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="radio_info_ping_hostname_v6">Ping Hostname(www.google.com) IPv6:</string>
-    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_http_client_test">HTTP Client Test:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="ping_test_label">Run Ping Test</string>
@@ -474,50 +449,22 @@
     <string name="airplane_mode">Airplane mode</string>
     <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
     <string name="wireless_networks_settings_title">Wireless &amp; networks</string>
-    <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
-    <string name="radio_controls_summary">Manage Wi\u2011Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
 
-    <!-- check box cellular data summary [CHAR LIMIT=85] -->
-    <string name="cellular_data_summary">Allow data usage over mobile network</string>
-    <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
-    <string name="allow_data_usage_title">Allow data usage when roaming</string>
     <!-- mobile network settings screen, setting check box title -->
     <string name="roaming">Roaming</string>
     <!-- mobile network settings screen, setting option summary text when check box is selected -->
     <string name="roaming_enable">Connect to data services when roaming</string>
     <!-- mobile network settings screen, setting option summary text when check box is clear -->
     <string name="roaming_disable">Connect to data services when roaming</string>
-    <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
-    <string name="roaming_reenable_message">You have lost data connectivity because you left your home network with data roaming turned off.</string>
-    <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
-    <string name="roaming_turn_it_on_button">Turn it on</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
     <string name="roaming_warning">Roaming charges may apply.</string>
-    <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
-    <string name="roaming_warning_multiuser" product="tablet">When you allow data roaming, roaming charges may apply.\n\nThis setting affects all users on this tablet.</string>
-    <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
-    <string name="roaming_warning_multiuser" product="default">When you allow data roaming, roaming charges may apply.\n\nThis setting affects all users on this phone.</string>
-    <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
-    <string name="roaming_reenable_title">Allow data roaming?</string>
-    <!-- mobile network settings screen, setting option name -->
-    <string name="networks">Operator selection</string>
-    <!-- mobile network settings screen, setting option summary text -->
-    <string name="sum_carrier_select">Choose a network operator</string>
 
-    <!-- Main Settings screen setting option name to go into the date and time settings-->
-    <string name="date_and_time_settings_title">Date &amp; time</string>
-    <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
-    <string name="date_and_time_settings_title_setup_wizard">Set date and time</string>
-    <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
-    <string name="date_and_time_settings_summary">Set date, time, time zone, &amp; formats</string>
     <!-- Date & time setting screen setting switch title: whether the system clock (Unix epoch time) should be determined automatically [CHAR LIMIT=100] -->
     <string name="date_time_auto">Set time automatically</string>
     <!-- Date & time setting screen setting switch title: whether the time zone should be determined automatically [CHAR LIMIT=100]  -->
     <string name="zone_auto_title">Set automatically</string>
     <!-- Date & time setting screen setting option summary text for the automatic 24 hour setting checkbox [CHAR LIMIT=100] -->
     <string name="date_time_24hour_auto">Use locale default</string>
-    <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
-    <string name="date_time_24hour_title">24\u2011hour format</string>
     <!-- Date & time setting screen setting check box title -->
     <string name="date_time_24hour">Use 24-hour format</string>
     <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
@@ -536,8 +483,6 @@
     <string name="date_time_select_region">Region</string>
     <!-- Setting option title in time zone setting screen [CHAR LIMIT=30] -->
     <string name="date_time_select_fixed_offset_time_zones">Select UTC offset</string>
-    <!-- Label describing when a given time zone changes to DST or standard time -->
-    <string name="zone_change_to_from_dst"><xliff:g id="time_type" example="Pacific Summer Time">%1$s</xliff:g> starts on <xliff:g id="transition_date" example="Mar 11 2018">%2$s</xliff:g>.</string>
     <!-- Label describing a exemplar location and time zone offset[CHAR LIMIT=NONE] -->
     <string name="zone_info_exemplar_location_and_offset"><xliff:g id="exemplar_location" example="Los Angeles">%1$s</xliff:g> (<xliff:g id="offset" example="GMT-08:00">%2$s</xliff:g>)</string>
     <!-- Label describing a time zone offset and name[CHAR LIMIT=NONE] -->
@@ -557,13 +502,6 @@
     <!-- The menu item to switch to selecting a time zone with a fixed offset (such as UTC or GMT+0200) [CHAR LIMIT=30] -->
     <string name="zone_menu_by_offset">Select by UTC offset</string>
 
-    <!-- Title string shown above DatePicker, letting a user select system date
-         [CHAR LIMIT=20] -->
-    <string name="date_picker_title">Date</string>
-    <!-- Title string shown above TimePicker, letting a user select system time
-         [CHAR LIMIT=20] -->
-    <string name="time_picker_title">Time</string>
-
     <!-- Security Settings --><skip />
 
     <!-- Security settings screen, setting option name to change screen timeout -->
@@ -574,32 +512,14 @@
     <string name="lock_immediately_summary_with_exception">Immediately after timeout, except when kept unlocked by <xliff:g id="trust_agent_name">%1$s</xliff:g></string>
     <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
     <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> after timeout, except when kept unlocked by <xliff:g id="trust_agent_name">%2$s</xliff:g></string>
-    <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
-    <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=30]-->
     <string name="owner_info_settings_title">Add text on lock screen</string>
-    <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
-    <string name="security_enable_widgets_title">Enable widgets</string>
-    <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
-    <string name="security_enable_widgets_disabled_summary">Disabled by admin</string>
-
-    <!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
-    <string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>
-    <!-- Text shown for the description of the lock when trust lost option [CHAR LIMIT=NONE -->
-    <string name="trust_lost_locks_screen_summary">If enabled, the device will lock when the last trust agent loses trust</string>
 
     <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary">None</string>
-    <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
-    <string name="owner_info_settings_status"><xliff:g id="count" example="90">%1$d</xliff:g> / <xliff:g id="count" example="100">%2$d</xliff:g></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
     <string name="owner_info_settings_edit_text_hint">E.g., Joe\u2019s Android.</string>
 
-    <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
-    <string name="show_profile_info_on_lockscreen_label">Show profile info on lock screen</string>
-
-    <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
-    <string name="Accounts_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Location</string>
     <!-- Used in the location settings to control turning on/off the feature entirely [CHAR LIMIT=60] -->
@@ -646,12 +566,6 @@
     <string name="lockscreen_settings_title">Lock screen</string>
     <!-- Category title for the settings that control what lockscreen shows. [CHAR LIMIT=30] -->
     <string name="lockscreen_settings_what_to_show_category">What to show</string>
-    <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
-    <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
-    <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
-    <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
-    <!-- In the security screen, the header title for settings related to  Passwords-->
-    <string name="security_passwords_title">Privacy</string>
     <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
     <string name="disabled_by_administrator_summary">Not available</string>
     <!-- In the security screen, the header title for security statuses -->
@@ -822,8 +736,6 @@
     <string name="security_settings_face_enroll_repeat_title">Center your face in the circle</string>
     <!-- Button text to skip enrollment of face [CHAR LIMIT=40] -->
     <string name="security_settings_face_enroll_enrolling_skip">Skip</string>
-    <!-- Text shown when "Add face" button is disabled -->
-    <string name="face_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> faces</string>
     <!-- Text shown when users has enrolled a maximum number of faces [CHAR LIMIT=NONE] -->
     <string name="face_intro_error_max">You\u2019ve added the maximum number of faces</string>
     <!-- Text shown when an unknown error caused the device to be unable to add faces [CHAR LIMIT=NONE] -->
@@ -1283,8 +1195,6 @@
     <string name="security_advanced_settings_keywords">security, more security settings, more settings, advanced security settings</string>
     <!-- Title for the section that has additional privacy settings. [CHAR LIMIT=60] -->
     <string name="privacy_advanced_settings">More privacy settings</string>
-    <!-- Title for the section that has additional privacy settings. [CHAR LIMIT=60] -->
-    <string name="privacy_advanced_settings_summary">Autofill, activity controls, and more</string>
 
     <!-- Text shown when "Add fingerprint" button is disabled -->
     <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>
@@ -1293,15 +1203,9 @@
     <!-- Text shown when an unknown error caused the device to be unable to add fingerprints [CHAR LIMIT=NONE] -->
     <string name="fingerprint_intro_error_unknown">Can\u2019t add more fingerprints</string>
 
-    <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=50]-->
-    <string name="fingerprint_last_delete_title">Remove all fingerprints?</string>
-
     <!-- Title shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=50]-->
     <string name="fingerprint_delete_title">Delete \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\'</string>
 
-    <!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
-    <string name="fingerprint_delete_message">Do you want to delete this fingerprint?</string>
-
     <!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
     <string name="fingerprint_v2_delete_message">This deletes the fingerprint images and model associated with \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\' that are stored on your device</string>
 
@@ -1309,9 +1213,6 @@
     <string name="fingerprint_last_delete_message">You won\'t be able to use your fingerprint to unlock your phone or verify it\'s you in apps.</string>
     <string name="fingerprint_last_delete_message_profile_challenge">You won\'t be able to use your fingerprint to unlock your work profile, authorize purchases, or sign in to work apps.</string>
 
-    <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
-    <string name="fingerprint_last_delete_confirm">Yes, remove</string>
-
     <!-- Title of the preferences category for preference items to control encryption -->
     <string name="encryption_settings_title">Encryption</string>
 
@@ -1407,49 +1308,24 @@
     <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
 
-    <!--  Summary for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=NONE] -->
-    <string name="unlock_set_unlock_launch_picker_summary_lock_immediately"><xliff:g id="unlock_method" example="PIN">%1$s</xliff:g> / Immediately after sleep</string>
-
-    <!--  Summary for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=NONE] -->
-    <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout"><xliff:g id="unlock_method" example="PIN">%1$s</xliff:g> / <xliff:g id="timeout_string">%2$s</xliff:g> after sleep</string>
-
     <!--  Profile Security lock settings --><skip />
     <!--  Title for PreferenceScreen to launch picker for security method for the managed profile when there is none [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_launch_picker_title_profile">Work profile lock</string>
 
-    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_launch_picker_change_title">Change lock screen</string>
-
-    <!--  Summary for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
-    <string name="unlock_set_unlock_launch_picker_change_summary">Change or disable pattern, PIN, or password security</string>
-
-    <!--  Summary for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
-    <string name="unlock_set_unlock_launch_picker_enable_summary">Choose a method to lock the screen</string>
-
     <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_off_title">None</string>
-    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_off_summary"></string>
 
     <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_none_title">Swipe</string>
-    <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
-    <string name="unlock_set_unlock_none_summary">No security</string>
 
     <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
     <string name="unlock_set_unlock_pattern_title">Pattern</string>
-    <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_pattern_summary">Medium security</string>
 
     <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_pin_title">PIN</string>
-    <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_pin_summary">Medium to high security</string>
 
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_password_title">Password</string>
-    <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_password_summary">High security</string>
 
     <!-- Title for preference that allows the user to setup their lock screen preference later [CHAR LIMIT=22] -->
     <string name="unlock_set_do_later_title">Not now</string>
@@ -1490,10 +1366,6 @@
     <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
     <string name="biometrics_unlock_title">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</string>
 
-    <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
-    <string name="unlock_set_unlock_disabled_summary">Disabled by admin, encryption policy, or
-        credential storage</string>
-
     <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_off">None</string>
     <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
@@ -1505,14 +1377,6 @@
     <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_password">Password</string>
 
-    <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
-         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
-         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
-    <string name="unlock_setup_wizard_fingerprint_details">Once you\u2019ve set up a screen lock, you can also set up your fingerprint in Settings &gt; Security.</string>
-
-    <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
-    <string name="unlock_disable_lock_title">Turn off screen lock</string>
-
     <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
     <string name="unlock_disable_frp_warning_title">Delete screen lock?</string>
     <!-- Title of the dialog shown when the user removes the profile lock [CHAR LIMIT=NONE] -->
@@ -1554,13 +1418,6 @@
     <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
     <string name="unlock_disable_frp_warning_ok">Delete</string>
 
-    <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
-    <string name="unlock_change_lock_pattern_title">Change unlock pattern</string>
-    <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
-    <string name="unlock_change_lock_pin_title">Change unlock PIN</string>
-    <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
-    <string name="unlock_change_lock_password_title">Change unlock password</string>
-
     <!-- Footer preference text in the screen lock type picker to indicate which app is requesting a new screen lock and that it requests for a strong PIN or password  [CHAR LIMIT=NONE] -->
     <string name="unlock_footer_high_complexity_requested"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> recommends a strong PIN or password and may not work as expected without one</string>
     <!-- Footer preference text in the screen lock type picker to indicate which app is requesting a new screen lock and that it requests for a medium strength PIN or password [CHAR LIMIT=NONE] -->
@@ -1613,9 +1470,6 @@
         <item quantity="other">PIN must be at least <xliff:g id="count" example="3">%d</xliff:g> digits</item>
     </plurals>
 
-    <!-- Hint shown after minimum password criteria is met -->
-    <string name="lockpassword_continue_label">Continue</string>
-
     <!-- Error shown in popup when password is too long -->
     <plurals name="lockpassword_password_too_long">
         <item quantity="one">Must be fewer than <xliff:g id="number" example="1">%d</xliff:g> character</item>
@@ -1633,15 +1487,6 @@
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
     <string name="lockpassword_illegal_character">This can\'t include an invalid character</string>
 
-    <!-- Error shown when in PASSWORD mode and password is all digits -->
-    <string name="lockpassword_password_requires_alpha">Must contain at least one letter</string>
-
-    <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
-    <string name="lockpassword_password_requires_digit">Must contain at least one digit</string>
-
-    <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
-    <string name="lockpassword_password_requires_symbol">Must contain at least one symbol</string>
-
     <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
     <plurals name="lockpassword_password_requires_letters">
         <item quantity="one">Must contain at least 1 letter</item>
@@ -1694,9 +1539,6 @@
     <!-- Label for Confirm button when entering PIN / password the second time. [CHAR LIMIT=30] -->
     <string name="lockpassword_confirm_label">Confirm</string>
 
-    <!-- Label for ChoosePassword/PIN OK button -->
-    <string name="lockpassword_cancel_label">Cancel</string>
-
     <!-- Label for ChoosePassword/PIN Clear button that clears all text entered by the user so far. -->
     <string name="lockpassword_clear_label">Clear</string>
 
@@ -1709,9 +1551,6 @@
     <!-- Label for LockPatternTutorial Continue button -->
     <string name="lockpattern_tutorial_continue_label">Next</string>
 
-    <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
-    <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string>
-
     <!-- Title of preference to manage device admin apps, which are used by IT admins to manage devices -->
     <string name="manage_device_admin">Device admin apps</string>
 
@@ -1826,14 +1665,6 @@
     <!-- Bluetooth device details companion apps. In the confirmation dialog for removing an associated app, this is the label on the button that will complete the disassociate action. [CHAR LIMIT=80] -->
     <string name = "bluetooth_companion_app_remove_association_confirm_button">Disconnect app</string>
 
-    <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
-    <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for internet access</string>
-    <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
-    <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local internet connection with device</string>
-
-    <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
-    <string name="bluetooth_dock_settings_remember">Remember settings</string>
-
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
     <string name="bluetooth_max_connected_audio_devices_string">Maximum connected Bluetooth audio devices</string>
     <!-- Bluetooth developer settings: Maximum number of connected audio devices -->
@@ -1875,8 +1706,6 @@
     <string name="wifi_display_status_in_use">In use</string>
     <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_not_available">Unavailable</string>
-    <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
-    <string name="wifi_display_details">Display settings</string>
 
     <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
     <string name="wifi_display_options_title">Wireless display options</string>
@@ -1919,8 +1748,6 @@
     <string name="wifi_time_remaining"><xliff:g id="Remaining time" example="1 day, 2 hours, 3 minutes">%1$s</xliff:g> left</string>
     <!-- Text shown in wifi settings indicating at what time the connection will expire on an internet access point that has a time limit for the session [CHAR LIMIT=40] -->
     <string name="wifi_expiry_time">Expires on <xliff:g id="Expiry time" example="2020/01/02 12:34PM">%1$s</xliff:g></string>
-    <!-- Wifi Sign in CTA for wifi settings when captive portal auth is required [CHAR LIMIT = 50] -->
-    <string name="wifi_tap_to_sign_in">Tap here to sign in to network</string>
     <!-- Transmit Link speed on Wifi Status screen [CHAR LIMIT=32] -->
     <string name="tx_link_speed"><xliff:g id="Transmit link speed" example="150 Mbps">%1$d</xliff:g> Mbps</string>
     <!-- Receive Link speed on Wifi Status screen [CHAR LIMIT=32] -->
@@ -1945,14 +1772,6 @@
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
-    <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
-    <string name="nfc_quick_toggle_summary" product="tablet">Allow data exchange when the tablet touches an NFC device</string>
-    <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
-    <string name="nfc_quick_toggle_summary" product="default">Allow data exchange when the phone touches an NFC device</string>
-    <!-- Dialog title for NFC disclaimer [CHAR_LIMIT=40]-->
-    <string name="nfc_disclaimer_title">Turn on NFC</string>
-    <!-- Dialog content for NFC disclaimer: telling user NFC can exchange data when device is nearby other devices (for example: payment terminals, badge reader etc). [CHAR_LIMIT=NONE]-->
-    <string name="nfc_disclaimer_content">NFC exchanges data between this device and other nearby devices or targets, such as payment terminals, access readers, and interactive ads or tags.</string>
 
     <!-- Used in the settings screen to secure NFC [CHAR LIMIT=NONE] -->
     <string name="nfc_secure_settings_title">Require device unlock for NFC</string>
@@ -1965,16 +1784,10 @@
     <string name="android_beam_on_summary">Ready to transmit app content via NFC</string>
     <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
     <string name="nfc_disabled_summary">Unavailable because NFC is turned off</string>
-    <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
-    <string name="android_beam_label">Android Beam</string>
     <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
     <string name="android_beam_explained">When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed.</string>
 
     <!-- Wi-Fi Settings --> <skip />
-    <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
-    <string name="wifi_quick_toggle_title">Wi\u2011Fi</string>
-    <!-- Used in the 1st-level settings screen as the turn-on summary -->
-    <string name="wifi_quick_toggle_summary">Turn on Wi\u2011Fi</string>
     <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
     <string name="wifi_settings">Wi\u2011Fi</string>
 
@@ -1982,10 +1795,6 @@
     <string name="wifi_settings_primary_switch_title">Use Wi\u2011Fi</string>
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Wi\u2011Fi settings</string>
-    <!-- Title of the Wi-fi settings entry in the left top level menu -->
-    <string name="wifi_settings_title">Wi\u2011Fi</string>
-    <!-- Summary text of the Wi-fi settings screen -->
-    <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
     <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
     <string name="wifi_select_network">Select Wi\u2011Fi</string>
     <!-- Summary text when turning Wi-Fi or bluetooth on -->
@@ -2008,24 +1817,6 @@
     <string name="wifi_wakeup_summary">Wi\u2011Fi will turn back on near high\u2011quality saved networks, like your home network</string>
     <!-- Checkbox summary for auto-wifi when user needs to enable location scanning to toggle it -->
     <string name="wifi_wakeup_summary_no_location">Unavailable because location is turned off. Turn on <annotation id="link">location</annotation>.</string>
-    <!-- Checkbox summary for Wi-Fi wakeup option to explain that Wi-Fi wakeup is disabled because Wi-Fi scanning is turned off -->
-    <string name="wifi_wakeup_summary_scanning_disabled">Unavailable because Wi\u2011Fi scanning is turned off</string>
-    <!-- Checkbox summary for Wi-Fi wakeup option to explain that a network rating provider needs to be selected to use the feature. -->
-    <string name="wifi_wakeup_summary_scoring_disabled">To use, select a network rating provider</string>
-    <!-- Checkbox title for option to toggle poor network detection -->
-    <string name="wifi_poor_network_detection">Avoid poor connections</string>
-    <!-- Checkbox summary for option to toggle poor network detection -->
-    <string name="wifi_poor_network_detection_summary">Don\u2019t use a Wi\u2011Fi network unless it has a good internet connection</string>
-    <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
-    <string name="wifi_avoid_poor_network_detection_summary">Only use networks that have a good internet connection</string>
-    <!-- Checkbox title for option to connect to public Wi-Fi automatically [CHAR LIMIT=40] -->
-    <string name="use_open_wifi_automatically_title">Connect to public networks</string>
-    <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
-    <string name="use_open_wifi_automatically_summary">Automatically connect to high\u2011quality public networks</string>
-    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a network rating provider needs to be selected to use the feature. -->
-    <string name="use_open_wifi_automatically_summary_scoring_disabled">To use, select a network rating provider</string>
-    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a compatible network rating provider needs to be selected to use the feature. -->
-    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled">To use, select a compatible network rating provider</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
@@ -2039,24 +1830,6 @@
         turn on Wi-Fi scanning in
         <xliff:g id="link_begin">LINK_BEGIN</xliff:g>Wi\u2011Fi scanning
         settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
-    <!-- Wifi scan always mode checkbox text -->
-    <string name="wifi_scan_notify_remember_choice">Don\u2019t show again</string>
-    <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
-    <string name="wifi_setting_sleep_policy_title">Keep Wi\u2011Fi on during sleep</string>
-    <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
-    <string name="wifi_setting_on_during_sleep_title">Wi\u2011Fi on during sleep</string>
-    <!-- Generic error message when the sleep policy could not be set. -->
-    <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
-    <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
-    <string name="wifi_suspend_efficiency_title">Improve efficiency</string>
-    <!-- Checkbox title for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations">Wi\u2011Fi optimization</string>
-    <!-- Checkbox summary for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations_summary">Minimize battery usage when Wi\u2011Fi is on</string>
-    <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
-    <string name="wifi_limit_optimizations_summary">Limit battery used by Wi\u2011Fi</string>
-    <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
-    <string name="wifi_switch_away_when_unvalidated">Switch to mobile data if Wi\u2011Fi loses internet access.</string>
     <!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->
     <string name="wifi_cellular_data_fallback_title">Switch to mobile data automatically</string>
     <!-- Preference summary to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->
@@ -2095,10 +1868,6 @@
     <string name="wifi_empty_list_wifi_on">Searching for networks\u2026</string>
     <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
     <string name="wifi_empty_list_user_restricted">You don\u2019t have permission to change the Wi\u2011Fi network.</string>
-    <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
-    <string name="wifi_more">More</string>
-    <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
-    <string name="wifi_setup_wps">Automatic setup (WPS)</string>
     <!-- Wi-Fi settings dialog. Title of dialog displayed asking user to enable Wi-Fi Scanning [CHAR LIMIT=60]-->
     <string name="wifi_settings_scanning_required_title">Turn on Wi\u2011Fi scanning?</string>
     <!-- Wi-Fi settings dialog. Summary text describing why we need Wi-Fi scanning on. [CHAR LIMIT=NONE]-->
@@ -3815,10 +3584,6 @@
     <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$s</xliff:g> as your SMS app?</string>
     <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
 
-    <!-- Network Scorer Picker title [CHAR LIMIT=40]-->
-    <string name="network_scorer_picker_title">Network rating provider</string>
-    <string name="network_scorer_picker_none_preference">None</string>
-
     <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
     <string name="network_scorer_change_active_dialog_title">Change Wi\u2011Fi assistant?</string>
     <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
@@ -4790,15 +4555,14 @@
     <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
     <string name="allow_bind_app_widget_activity_always_allow_bind">Always allow <xliff:g id="widget_host_name">%1$s</xliff:g> to create widgets and access their data</string>
 
-    <!-- XXX remove? Strings used for displaying usage statistics -->
-    <string name="usage_stats_label">Usage statistics</string>
-
     <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
     <string name="testing_usage_stats">Usage statistics</string>
-    <!-- label for text to indicate sort options -->
-    <string name="display_order_text">Sort by:</string>
-    <!-- label for application name -->
-    <string name="app_name_label">App</string>
+    <!-- Spinner label to indicate sort by usage time. [CHAR LIMIT=30] -->
+    <string name="usage_stats_sort_by_usage_time">Sort by usage time</string>
+    <!-- Spinner label to indicate sort by last time used. [CHAR LIMIT=30] -->
+    <string name="usage_stats_sort_by_last_time_used">Sort by last time used</string>
+    <!-- Spinner label to indicate sort by app name. [CHAR LIMIT=30] -->
+    <string name="usage_stats_sort_by_app_name">Sort by app name</string>
     <!-- label for last time used -->
     <string name="last_time_used_label">Last time used</string>
     <!-- label for usage time -->
@@ -6535,8 +6299,6 @@
     <string name="background_data_dialog_title">Disable background data?</string>
     <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
     <string name="background_data_dialog_message">Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection.</string>
-    <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
-    <string name="sync_automatically">Auto-sync app data</string>
 
     <!-- Sync status messages on Accounts & Synchronization settings --><skip />
     <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
@@ -7488,22 +7250,12 @@
     <string name="wizard_back_portable">Switch to portable</string>
     <!-- Wizard next button label for adoptable [CHAR LIMIT=25] -->
     <string name="wizard_back_adoptable">Format another way</string>
-    <!-- Wizard finish button label [CHAR LIMIT=25] -->
-    <string name="wizard_finish">Finish</string>
 
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
 
-    <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
-    <string name="sim_setup_wizard_title">SIM cards</string>
     <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
     <string name="sim_settings_title">SIM cards</string>
-    <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
-    <string name="sim_settings_summary"><xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
-    <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
-    <string name="sim_cards_changed_message">SIM cards have changed</string>
-    <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
-    <string name="sim_cards_changed_message_summary">Tap to set activities</string>
     <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
     <string name="sim_cellular_data_unavailable">Mobile data is unavailable</string>
     <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
@@ -7524,48 +7276,18 @@
     <string name="select_specific_sim_for_data_button">Use <xliff:g id="new_sim" example="carrierA">%1$s</xliff:g></string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_calls">Call with</string>
-    <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
-    <string name="sim_select_card">Select a SIM card</string>
-    <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
-    <string name="sim_card_number_title">SIM <xliff:g id="card_number">%1$d</xliff:g></string>
-    <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_editor_name">SIM name</string>
     <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
     <string name="sim_name_hint">Enter SIM name</string>
     <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
     <string name="sim_editor_title">SIM slot %1$d</string>
-    <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_editor_carrier">Carrier</string>
-    <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_editor_number">Number</string>
-    <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_editor_color">SIM color</string>
-    <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
-    <string name="sim_card_select_title">Select SIM card</string>
     <!-- Orange label.  [CHAR LIMIT=40] -->
     <string name="color_orange">Orange</string>
     <!-- Purple label.  [CHAR LIMIT=40] -->
     <string name="color_purple">Purple</string>
-    <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
-    <string name="sim_no_inserted_msg">No SIM cards inserted</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">SIM status</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title_sim_slot">SIM status (sim slot %1$d)</string>
-    <!-- Title for call back. [CHAR LIMIT=60] -->
-    <string name="sim_call_back_title">Call back from default SIM</string>
-    <!-- Title for outgoing back. [CHAR LIMIT=60] -->
-    <string name="sim_outgoing_call_title">SIM for outgoing calls</string>
-    <!-- Title for other call settings. [CHAR LIMIT=60] -->
-    <string name="sim_other_call_settings">Other call settings</string>
-    <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
-    <string name="preferred_network_offload_title">Preferred network Offload</string>
-    <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
-    <string name="preferred_network_offload_header">Disable Network Name Broadcast</string>
-    <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
-    <string name="preferred_network_offload_footer">Disable Network Name Broadcast protects from third parties getting access to your network information.</string>
-    <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
-    <string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
     <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
     <string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
     <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
@@ -7615,8 +7337,6 @@
     <string name="nfc_and_payment_settings_payment_off_nfc_off_summary">Unavailable because NFC is off</string>
     <!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="nfc_and_payment_settings_no_payment_installed_summary">To use, first install a payment app</string>
-    <!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
-    <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
     <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="app_and_notification_dashboard_summary">Recent apps, default apps</string>
     <!-- Toast shown when an app in the work profile attempts to open notification settings. The apps in the work profile cannot access notification settings. [CHAR LIMIT=NONE] -->
@@ -7633,14 +7353,6 @@
     <!-- Summary text for language preference title, showing important setting items under language setting [CHAR LIMIT=NONE]-->
     <string name="languages_setting_summary">System languages, app languages</string>
 
-    <!-- Search strings -->
-    <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
-    <string name="search_results_title">Settings</string>
-    <!-- Search breadcrumb connector symbol -->
-    <string name="search_breadcrumb_connector" translatable="false">
-        <xliff:g name="first_item">%1$s</xliff:g> > <xliff:g name="second_item">%2$s</xliff:g>
-    </string>
-
     <!--Search Keywords [CHAR LIMIT=NONE]-->
     <string name="keywords_wifi">wifi, wi-fi, network connection, internet, wireless, data, wi fi</string>
     <!-- Search keyword for "Open Network Notification" settings. [CHAR_LIMIT=NONE]-->
@@ -7819,28 +7531,9 @@
     <!-- List of synonyms for the always show time and info [CHAR LIMIT=NONE] -->
     <string name="keywords_always_show_time_info">always on display, AOD</string>
 
-    <!-- Option title for the default sound, context based on screen -->
-    <string name="default_sound">Default sound</string>
-
-    <!-- Wifi Picker defaults-->
-    <!-- The minimum kbps threshold needed to use badge; value is a map with key corresponding to
-    the badge enum in ScoredNetworks (SD, HD etc) and value throughput in kbps -->
-    <string name="wifi_badging_thresholds_default" translatable="false">10:3000,20:5000,30:25000</string>
-
-    <!-- Sounds and Notification -->
-    <!-- Sound: Dashboard summary indicating the volume of ringtone. example: Ring volume at 20%.
-    [CHAR LIMIT=100] -->
-    <string name="sound_settings_summary">Ring &amp; notification volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
-
     <!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="sound_dashboard_summary">Volume, vibration, Do Not Disturb</string>
 
-    <!-- Sound: Dashboard summary indicating the volume of ringtone when at 0% with vibrate enabled. [CHAR LIMIT=100] -->
-    <string name="sound_settings_summary_vibrate">Ringer set to vibrate</string>
-
-    <!-- Sound: Dashboard summary indicating the volume of ringtone when at 0% with vibrate disabled [CHAR LIMIT=100] -->
-    <string name="sound_settings_summary_silent">Ringer set to silent</string>
-
     <!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
     <string name="media_volume_option_title">Media volume</string>
 
@@ -7874,24 +7567,9 @@
     <!-- Sound: Title for the option defining the default alarm sound. [CHAR LIMIT=30] -->
     <string name="alarm_ringtone_title">Default alarm sound</string>
 
-    <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
-    <string name="vibrate_when_ringing_title">Vibrate for calls</string>
-
-    <!-- Sound: Keywords for Vibrate for calls. [CHAR LIMIT=NONE] -->
-    <string name="keywords_vibrate_for_calls">Vibration</string>
-
-    <!-- Sound: Option for vibrate when ringing setting: Never vibrate. [CHAR LIMIT=40] -->
-    <string name="vibrate_when_ringing_option_never_vibrate">Never vibrate</string>
-
-    <!-- Sound: Option for vibrate when ringing setting: Always vibrate. [CHAR LIMIT=40] -->
-    <string name="vibrate_when_ringing_option_always_vibrate">Always vibrate</string>
-
     <!-- Sound: Option for vibrate when ringing setting: Ramping ringer. [CHAR LIMIT=80] -->
     <string name="vibrate_when_ringing_option_ramping_ringer">Vibrate first then ring gradually</string>
 
-    <!-- Sound: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="other_sound_settings">Other sounds</string>
-
     <!-- Sound: Title for the option enabling spatializer effect. [CHAR LIMIT=30] -->
     <string name="spatial_audio_title">Spatial audio</string>
 
@@ -8225,19 +7903,6 @@
     <!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
     <string name="zen_onboarding_dnd_visual_disturbances_header">Change Do Not Disturb notification settings?</string>
 
-    <!-- DO NOT TRANSLATE obsolete [CHAR LIMIT=NONE]-->
-    <string name="zen_onboarding_dnd_visual_disturbances_description" translatable="false">Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers</string>
-    <!-- DO NOT TRANSLATE obsolete -->
-    <string name="zen_onboarding_more_options" translatable="false">You can further customize this in Settings.</string>
-    <!-- DO NOT TRANSLATE obsolete -->
-    <string name="zen_onboarding_screen_on_title" translatable="false">Block when the screen is on</string>
-    <!-- DO NOT TRANSLATE obsolete -->
-    <string name="zen_onboarding_screen_off_title" translatable="false">Block when the screen is off</string>
-    <!-- DO NOT TRANSLATE obsolete -->
-    <string name="zen_onboarding_screen_off_summary" translatable="false">Don\'t turn on the screen or wake for notifications</string>
-    <!-- DO NOT TRANSLATE obsolete -->
-    <string name="zen_onboarding_screen_on_summary" translatable="false">Don\'t show notifications at all, except for basic phone activity and status</string>
-
     <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->
     <string name="sound_work_settings">Work profile sounds</string>
 
@@ -8268,18 +7933,6 @@
     <!-- Work Sound: Message for dialog shown when using the same sounds for work events as for personal events (notifications / ringtones / alarms). [CHAR LIMIT=none] -->
     <string name="work_sync_dialog_message">Your work profile will use the same sounds as your personal profile</string>
 
-    <!-- Sound installation: Title for the dialog to confirm that a new sound will be installed to the Ringtones, Notifications, or Alarms folder. [CHAR LIMIT=50] -->
-    <string name="ringtones_install_custom_sound_title">Add custom sound?</string>
-
-    <!-- Sound installation: Message for the dialog to confirm that a new sound will be installed to the Ringtones, Notifications, or Alarms folder. [CHAR LIMIT=none] -->
-    <string name="ringtones_install_custom_sound_content">This file will be copied to the <xliff:g id="folder_name" example="Ringtones">%s</xliff:g> folder</string>
-
-    <!-- Ringtones preference category: Title for the Ringotnes preference categories. [CHAR LIMIT=none] -->
-    <string name="ringtones_category_preference_title">Ringtones</string>
-
-    <!-- Other sounds and vibrations preference category: Title for the Other sounds and vibrations preference categories. [CHAR LIMIT=none] -->
-    <string name="other_sound_category_preference_title">Other sounds and vibrations</string>
-
     <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
     <string name="configure_notification_settings">Notifications</string>
 
@@ -8289,12 +7942,6 @@
     <!-- notification header - settings for conversation type notifications -->
     <string name="conversation_notifs_category">Conversation</string>
 
-    <!-- notification header - apps that have recently sent notifications -->
-    <string name="recent_notifications">Recently sent</string>
-
-    <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
-    <string name="recent_notifications_see_all_title">See all from last 7 days</string>
-
     <!-- notification header for general notification settings [CHAR LIMIT=80]-->
     <string name="general_notification_header">Manage</string>
 
@@ -8313,9 +7960,6 @@
     <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
     <string name="profile_section_header_for_advanced_privacy">Work profile</string>
 
-    <!-- Configure Notifications: section header for prioritizer settings  [CHAR LIMIT=80] -->
-    <string name="smart_notifications_title">Adaptive notifications</string>
-
     <!-- Configure Notifications: setting title [CHAR LIMIT=80 BACKUP_MESSAGE_ID=6691908606916292167] -->
     <string name="asst_capability_prioritizer_title">Adaptive notification priority</string>
 
@@ -8376,32 +8020,17 @@
     <!-- Configure Notifications: setting title, whether the snooze menu is shown on notifications [CHAR LIMIT=80] -->
     <string name="snooze_options_title">Allow notification snoozing</string>
 
-    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
-    <string name="hide_silent_icons_title">Hide icons from gentle notifications</string>
-
-    <!-- Configure Notifications: setting summary [CHAR LIMIT=NONE] -->
-    <string name="hide_silent_icons_summary">Icons from gentle notifications aren\'t shown in the status bar</string>
-
     <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=50 BACKUP_MESSAGE_ID=5125022693565388760] -->
     <string name="notification_badging_title">Notification dot on app icon</string>
 
-    <!-- Configure Notifications: Title for the people notification strip option. [CHAR LIMIT=60] -->
-    <string name="notification_people_strip_title">Show strip of recent conversations</string>
-
     <!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
     <string name="notification_bubbles_title">Bubbles</string>
-    <!-- Feature education for bubbles. [CHAR LIMIT=NONE] -->
-    <string name="bubbles_feature_education">Some notifications and other content can appear as bubbles on the screen. To open a bubble, tap it. To dismiss it, drag it down the screen.</string>
     <!-- Title for the toggle shown on the app-level bubbles page  [CHAR LIMIT=60] -->
     <string name="bubbles_app_toggle_title">Bubbles</string>
-    <!-- Title on the conversation level screen; links back to the app level setting -->
-    <string name="bubbles_conversation_app_link">All Bubble settings</string>
     <!-- Title for bubbles option on the conversation level screen -->
     <string name="bubbles_conversation_toggle_title">Bubble this conversation</string>
     <!-- Summary for bubbles option on the conversation level screen -->
     <string name="bubbles_conversation_toggle_summary">Show floating icon on top of apps</string>
-    <!-- Description for the toggle shown on the app-level bubbles page  [CHAR LIMIT=NONE] -->
-    <string name="bubbles_app_toggle_summary">Allow <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> to show some notifications as bubbles</string>
     <!-- Title of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=NONE] -->
     <string name="bubbles_feature_disabled_dialog_title">Turn on bubbles for device?</string>
     <!-- Description of the dialog shown when the user has disabled bubbles at the feature level but tries to enable it for an app. [CHAR LIMIT=NONE] -->
@@ -8432,42 +8061,12 @@
     <!-- Bubble app settings: Content description - action to make a conversation bubble -->
     <string name="bubble_app_setting_bubble_conversation">Turn on bubbles for this conversation</string>
 
-    <!-- Configure notifications: title for swipe direction [CHAR LIMIT=60] -->
-    <string name="swipe_direction_title">Swipe actions</string>
-
     <!-- Configure notifications: value for swipe direction [CHAR LIMIT=100] -->
     <string name="swipe_direction_ltr">Swipe right to dismiss, left to show menu</string>
 
     <!-- Configure notifications: value for swipe direction [CHAR LIMIT=100] -->
     <string name="swipe_direction_rtl">Swipe left to dismiss, right to show menu</string>
 
-    <!-- Configure notifications: link to education/gentle notification settings [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_title">Gentle notifications</string>
-
-    <!-- Gentle notifications settings : header for selecting where gentle notifications should appear [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_also_display">Also display in</string>
-
-    <!-- Gentle notifications settings: display in status bar  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_status">Status bar</string>
-
-    <!-- Gentle notifications settings: display in lock screen  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_lock">Lock screen</string>
-
-    <!-- Gentle notifications footer: what are gentle notification  [CHAR LIMIT=NONE] -->
-    <string name="gentle_notifications_education">Gentle notifications are always silent and always appear in the pull-down shade</string>
-
-    <!-- Gentle notifications settings: display only in shade  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_summary_shade">Display in pull-down shade only</string>
-
-    <!-- Gentle notifications settings: display in shade and on the lock screen  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_summary_shade_lock">Display in pull-down shade &amp; on lock screen</string>
-
-    <!-- Gentle notifications settings: display in shade and on status bar  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_summary_shade_status">Display in pull-down shade &amp; status bar</string>
-
-    <!-- Gentle notifications settings: display on all surfaces  [CHAR LIMIT=100] -->
-    <string name="gentle_notifications_display_summary_shade_status_lock">Display in pull-down shade, status bar &amp; on lock screen</string>
-
     <!-- Notification settings: suppress status bar/ambient icons for silent notifications -->
     <string name="silent_notifications_status_bar">Hide silent notifications in status bar</string>
 
@@ -8564,27 +8163,12 @@
     <!-- [CHAR LIMIT=100] Notification channel title -->
     <string name="notification_channel_title">Notification category</string>
 
-    <!-- [CHAR LIMIT=200] Notification channel group title -->
-    <string name="notification_group_title">Notification category group</string>
-
     <!-- [CHAR LIMIT=100] Notification importance screen title -->
     <string name="notification_importance_title">Behavior</string>
 
-    <!-- [CHAR LIMIT=100 BACKUP_MESSAGE_ID=1820188704793497324] Notification Importance: unspecified importance level description -->
-    <string name="notification_importance_unspecified">Allow sound</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance: blocked importance level description -->
-    <string name="notification_importance_blocked">Never show notifications</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance template for the channel importance summary -->
-    <string name="notification_importance_divider" translatable="false"><xliff:g id="importance_title">%1$s</xliff:g>: <xliff:g id="importance_summary">%2$s</xliff:g></string>
-
     <!-- [CHAR LIMIT=100] Header for a grouping on conversations-->
     <string name="conversations_category_title">Conversations</string>
 
-    <!-- [CHAR LIMIT=100] Header for an individual conversation-->
-    <string name="conversation_category_title">Conversation</string>
-
     <!-- [CHAR LIMIT=100] Title for switch that says whether this app can appear in the conversation notification section-->
     <string name="conversation_section_switch_title">Conversation section</string>
 
@@ -8606,9 +8190,6 @@
     <!-- [CHAR LIMIT=NONE] Summary for promote_conversation_title on notifications settings page -->
     <string name="promote_conversation_summary">Add to the conversation section</string>
 
-    <!-- [CHAR LIMIT=100] link to page listing all conversations -->
-    <string name="manage_conversations">Manage conversations</string>
-
     <!-- [CHAR LIMIT=100] summary text on link to 'all conversations' page, no conversations are priority -->
     <string name="priority_conversation_count_zero">No priority conversations</string>
 
@@ -8648,12 +8229,6 @@
     <!-- a11y string -->
     <string name="clear">Clear</string>
 
-    <!-- [CHAR LIMIT=100] Setting to automatically bubble all notifications from favorite conversations -->
-    <string name="important_bubble">Bubble priority conversations</string>
-
-    <!-- [CHAR LIMIT=NONE] description of how notifications from important conversations behave -->
-    <string name="important_conversation_behavior_summary">Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb.</string>
-
     <!-- title for conversation onboarding -->
     <string name="conversation_onboarding_title">Priority and modified conversations will appear here</string>
 
@@ -8662,43 +8237,15 @@
         \n\nTo change conversation settings:
         \nSwipe down from the top of the screen to open the pull-down shade, then touch &amp; hold a conversation.</string>
 
-    <!-- Importance title strings for the Importance page. Also the second part of the importance
-     summary on the channel page-->
-
-    <!-- [CHAR LIMIT=100] Notification Importance: min importance level description -->
-    <string name="notification_importance_min">Show silently and minimize</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance: low importance level description -->
-    <string name="notification_importance_low">Show silently</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance: normal importance level description -->
-    <string name="notification_importance_default">Make sound</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance: high importance level description -->
-    <string name="notification_importance_high">Make sound and pop on screen</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance: high importance level description,
-     when the user has picked high importance but disabled sound for it -->
-    <string name="notification_importance_high_silent">Pop on screen</string>
-
     <!-- Importance title strings for the Importance page. Also the first part of the importance
      summary on the channel page-->
 
     <!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
     <string name="notification_importance_min_title">Minimize</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance title: low importance level title -->
-    <string name="notification_importance_low_title">Medium</string>
-
-    <!-- [CHAR LIMIT=100] Notification Importance title: normal importance level title -->
-    <string name="notification_importance_default_title">High</string>
-
     <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
     <string name="notification_importance_high_title">Pop on screen</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance title -->
-    <string name="notification_block_title">Block</string>
-
     <!-- [CHAR LIMIT=100] Notification Importance title -->
     <string name="notification_silence_title">Silent</string>
 
@@ -8742,9 +8289,6 @@
     <!-- [CHAR LIMIT=100] Label for on/off toggle -->
     <string name="notification_app_switch_label">All <xliff:g id="app_name" example="Android Services">%1$s</xliff:g> notifications</string>
 
-    <!-- Default Apps > Default notification assistant -->
-    <string name="default_notification_assistant">Adaptive Notifications</string>
-
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <plurals name="notifications_sent_daily">
         <item quantity="one">About <xliff:g id="number">%d</xliff:g> notification per day</item>
@@ -8766,9 +8310,6 @@
          notification listener to access work profile notifications [CHAR LIMIT=100] -->
     <string name="work_profile_notification_access_blocked_summary">Access to work profile notifications is blocked</string>
 
-    <!-- Summary of preference to manage notification listeners, when none are enabled -->
-    <string name="manage_notification_access_summary_zero">Apps cannot read notifications</string>
-
     <!-- Title for Notification Assistant setting  [CHAR LIMIT=30]-->
     <string name="notification_assistant_title">Enhanced notifications</string>
     <!-- Summary of Notification Assistant provided features [CHAR LIMIT=NONE]-->
@@ -8783,10 +8324,6 @@
     <!-- Button title that grants 'notification access' permission to an app [CHAR_LIMIT=60]-->
     <string name="notification_access_detail_switch">Allow notification access</string>
 
-    <!-- Title for a warning message about security implications of enabling a notification
-      assistant, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="notification_assistant_security_warning_title">Allow notification access for
-         <xliff:g id="service" example="NotificationAssistant">%1$s</xliff:g>?</string>
     <!-- Summary for a warning message about security implications of enabling a notification
           assistant, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_assistant_security_warning_summary">
@@ -8821,7 +8358,6 @@
     </string>
     <string name="notification_listener_disable_warning_confirm">Turn off</string>
     <string name="notification_listener_disable_warning_cancel">Cancel</string>
-    <string name="notification_listener_type_title">Allowed notification types</string>
     <string name="notif_type_ongoing">Real-time</string>
     <string name="notif_type_ongoing_summary">Ongoing communication from apps in use, navigation, phone calls, and more</string>
     <string name="notif_type_conversation">Conversations</string>
@@ -8903,10 +8439,6 @@
     these keywords will surface that feature. [CHAR LIMIT=NONE] -->
     <string name="interact_across_profiles_keywords">cross profile connected app apps work and personal</string>
 
-    <!-- Settings header. This setting shows a user's connected work and personal apps.
-    When a user connects select work and personal apps, they can access work and personal data together. [CHAR LIMIT=NONE] -->
-    <string name="interact_across_profiles_app_detail_title">Connected work &amp; personal apps</string>
-
     <!-- Toggle label. This text is shown when a user's work and personal apps are connected. [CHAR LIMIT=NONE] -->
     <string name="interact_across_profiles_switch_enabled">Connected</string>
 
@@ -8989,9 +8521,6 @@
     <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
     <string name="zen_access_empty_text">No installed apps have requested Do Not Disturb access</string>
 
-    <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
-    <string name="loading_notification_apps">Loading apps\u2026</string>
-
     <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
     <string name="app_notifications_off_desc">At your request, Android is blocking this app\'s notifications from appearing on this device</string>
 
@@ -9013,17 +8542,6 @@
     <!-- [CHAR LIMIT=NONE] App notification settings: link to app notification settings-->
     <string name="app_settings_link">Additional settings in the app</string>
 
-    <!-- [CHAR LIMIT=NONE] Apps & notification settings: summary on the link to notification settings-->
-    <string name="notification_screen_summary">Notification history, bubbles, recently sent</string>
-
-    <!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->
-    <string name="app_notification_listing_summary_zero">On for all apps</string>
-    <!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->
-    <plurals name="app_notification_listing_summary_others">
-        <item quantity="one">Off for <xliff:g id="count" example="1">%d</xliff:g> app</item>
-        <item quantity="other">Off for <xliff:g id="count" example="10">%d</xliff:g> apps</item>
-    </plurals>
-
     <!-- [CHAR LIMIT=NONE] Footer listing a count of deleted channels. -->
     <plurals name="deleted_channels">
         <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> category deleted</item>
@@ -9057,21 +8575,9 @@
     <!-- [CHAR LIMIT=NONE] App notification settings: Visibility override option title -->
     <string name="app_notification_visibility_override_title">Lock screen</string>
 
-    <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when allowed -->
-    <string name="app_notification_row_banned">Blocked</string>
-
-    <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
-    <string name="app_notification_row_priority">Priority</string>
-
-    <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
-    <string name="app_notification_row_sensitive">Sensitive</string>
-
     <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
     <string name="app_notifications_dialog_done">Done</string>
 
-    <!-- [CHAR LIMIT=150] App notification settings: App notifications Importance title -->
-    <string name="app_notification_importance_title">Importance</string>
-
     <!-- [CHAR LIMIT=180] Notification settings: lights -->
     <string name="notification_show_lights_title">Blink light</string>
 
@@ -9084,15 +8590,6 @@
     <!-- [CHAR LIMIT=180] Notification conversation: important -->
     <string name="notification_conversation_important">Priority</string>
 
-    <!-- [CHAR LIMIT=180] Notification conversation: add to home screen -->
-    <string name="notification_conversation_add_to_home">Add to home</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Rule delete button -->
-    <string name="zen_mode_rule_delete_button">Delete</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Rule name edit button -->
-    <string name="zen_mode_rule_rename_button">Rename</string>
-
     <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
     <string name="zen_mode_rule_name">Schedule name</string>
 
@@ -9111,9 +8608,6 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Add time-based rule, set rule name title -->
     <string name="zen_mode_add_time_rule">Add time schedule</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
-    <string name="zen_mode_delete_rule">Delete schedule</string>
-
     <!-- [CHAR LIMIT=60] Zen mode settings: Choose rule type dialog title -->
     <string name="zen_mode_choose_rule_type">Choose schedule type</string>
 
@@ -9123,9 +8617,6 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
     <string name="zen_mode_delete_rule_button">Delete</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
-    <string name="zen_mode_rule_type_unknown">Unknown</string>
-
     <!-- [CHAR LIMIT=NONE] Zen mode behavior settings footer: footer describing why the user cannot change the current do not disturb behavior settings -->
     <string name="zen_mode_app_set_behavior">These settings can\'t be changed right now. An app (<xliff:g id="app_name" example="Android Services">%1$s</xliff:g>) has automatically turned on Do Not Disturb with custom behavior."</string>
 
@@ -9138,27 +8629,12 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
     <string name="zen_schedule_rule_type_name">Time</string>
 
-    <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
-    <string name="zen_schedule_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified times</string>
-
     <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
     <string name="zen_event_rule_type_name">Event</string>
 
-    <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
-    <string name="zen_event_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified events</string>
-
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
     <string name="zen_mode_event_rule_calendar">During events for</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
-    <string name="zen_mode_event_rule_summary_calendar_template">During events for <xliff:g id="calendar" example="any calendar">%1$s</xliff:g></string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
-    <string name="zen_mode_event_rule_summary_any_calendar">any calendar</string>
-
-    <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
-    <string name="zen_mode_event_rule_summary_reply_template">Where reply is <xliff:g id="reply" example="Yes, Maybe, or Not replied">%1$s</xliff:g></string>
-
     <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
     <string name="zen_mode_event_rule_calendar_any">Any calendar</string>
 
@@ -9189,9 +8665,6 @@
     <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
     <string name="zen_mode_schedule_rule_days_none">None</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
-    <string name="zen_mode_schedule_rule_days_all">Every day</string>
-
     <!-- [CHAR LIMIT=60] Zen mode settings: Downtime rule setting -->
     <string name="zen_mode_schedule_alarm_title">Alarm can override end time</string>
 
@@ -9216,9 +8689,6 @@
     <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
     <string name="summary_range_symbol_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> - <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
 
-    <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
-    <string name="summary_range_verbal_combination"><xliff:g id="start" example="Sun">%1$s</xliff:g> to <xliff:g id="end" example="Thu">%2$s</xliff:g></string>
-
     <!-- [CHAR LIMIT=120] Zen mode settings: Title for conversations settings page -->
     <string name="zen_mode_conversations_title">Conversations</string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Header for conversations settings page -->
@@ -9386,10 +8856,6 @@
     </string>
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND title-->
     <string name="zen_mode_bypassing_apps_title">Apps</string>
-    <!-- [CHAR LIMIT=100] Zen mode settings: App that can bypass DND's secondary text describing which notification channels from the app can bypass DND-->
-    <string name="zen_mode_bypassing_apps_all_summary">All notifications</string>
-    <!-- [CHAR LIMIT=100] Zen mode settings: App that can bypass DND's secondary text describing which notification channels from the app can bypass DND-->
-    <string name="zen_mode_bypassing_apps_some_summary">Some notifications</string>
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow notifications from an app to bypass DND header -->
     <string name="zen_mode_bypassing_app_channels_header">Notifications that can interrupt</string>
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow all notifications from an app to bypass DND
@@ -9434,17 +8900,6 @@
     <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
     <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g>-minute period</string>
 
-    <!-- [CHAR LIMIT=50] Zen mode settings dnd beahvior description: when a user has chosen custom sounds to bypass DND -->
-    <string name="zen_mode_behavior_summary_custom">Custom</string>
-
-    <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
-    <string name="zen_mode_when">Automatically turn on</string>
-    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
-    <string name="zen_mode_when_never">Never</string>
-    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
-    <string name="zen_mode_when_every_night">Every night</string>
-    <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
-    <string name="zen_mode_when_weeknights">Weeknights</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
     <string name="zen_mode_start_time">Start time</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
@@ -9469,27 +8924,9 @@
     <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
     <string name="zen_mode_summary_always">Change to always interrupt</string>
 
-    <!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is on: title -->
-    <string name="zen_mode_screen_on">When the screen is on</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual signals: screen is on: summary -->
-    <string name="zen_mode_screen_on_summary">Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon</string>
-    <!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is off: title -->
-    <string name="zen_mode_screen_off">When the screen is off</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->
-    <string name="zen_mode_screen_off_summary">Let notifications silenced by Do Not Disturb turn on the screen and blink the light</string>
-    <!-- [CHAR LIMIT=130] Zen mode settings:  visual interruptions: screen is off: summary -->
-    <string name="zen_mode_screen_off_summary_no_led">Let notifications silenced by Do Not Disturb turn on the screen</string>
-
-    <!-- [CHAR LIMIT=NONE] Content description for per-app notification
-         settings button -->
-    <string name="notification_app_settings_button">Notification settings</string>
-
     <!-- Content description for help icon button [CHAR LIMIT=20] -->
     <string name="warning_button_text">Warning</string>
 
-    <!-- Generic label for suggestion card's ok button [CHAR LIMIT=20] -->
-    <string name="suggestion_button_text">Ok</string>
-
     <!-- Strings for suggestion card's close button [CHAR LIMIT=20] -->
     <string name="suggestion_button_close">Close</string>
 
@@ -9550,15 +8987,9 @@
     <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
     <string name="managing_admin">Managed by <xliff:g id="admin_app_label">%s</xliff:g></string>
 
-    <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
-    <string name="experimental_preference">(Experimental)</string>
-
     <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
     <string name="encryption_interstitial_header">Secure start-up</string>
 
-    <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
-    <string name="encryption_continue_button">Continue</string>
-
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
     <string name="encryption_interstitial_message_pin">
    You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.
@@ -9623,24 +9054,16 @@
     <!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->
     <string name="direct_boot_unaware_dialog_message">Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone</string>
 
-    <!-- Title and summary for SIM Status -->
-    <string name="imei_information_title">IMEI information</string>
-    <string name="imei_information_summary">IMEI relative information</string>
-    <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
-
     <!-- New strings needed for App Info 2 -->
     <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
     <string name="launch_by_default">Open by default</string>
 
-    <!-- Category name for App Launch -->
-    <string name="app_launch_domain_links_title">Opening links</string>
     <string name="app_launch_open_domain_urls_title">Open supported links</string>
     <!-- Preference title for Supported links open in this app. [CHAR LIMIT=60] -->
     <string name="app_launch_top_intro_message">Allow web links to open in this app</string>
     <!-- Preference title for Links to open in this app. [CHAR LIMIT=60] -->
     <string name="app_launch_links_category">Links to open in this app</string>
 
-    <string name="app_launch_open_domain_urls_summary">Open without asking</string>
     <string name="app_launch_supported_domain_urls_title">Supported links</string>
 
     <string name="app_launch_other_defaults_title">Other default preferences</string>
@@ -9701,22 +9124,6 @@
     <string name="notifications_label">Notifications</string>
     <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
     <string name="notifications_enabled_with_info"><xliff:g id="notifications_sent" example="~6 per week">%1$s</xliff:g> / <xliff:g id="notifications_categories_off" example="3 categories turned off">%2$s</xliff:g> </string>
-    <!-- Label for showing apps with some blocked notifications in list [CHAR LIMIT=30] -->
-    <string name="notifications_partly_blocked"><xliff:g id="count" example="1">%1$d</xliff:g> of <xliff:g id="count" example="10">%2$d</xliff:g> categories turned off</string>
-    <!-- App notification summary with notifications silenced [CHAR LIMIT=40] -->
-    <string name="notifications_silenced">Silenced</string>
-    <!-- App notification summary with notifications redacted [CHAR LIMIT=70] -->
-    <string name="notifications_redacted">Sensitive content not on lock screen</string>
-    <!-- App notification summary with notifications hidden [CHAR LIMIT=40] -->
-    <string name="notifications_hidden">Not on lock screen</string>
-    <!-- App notification summary with notifications bypassing DND [CHAR LIMIT=40] -->
-    <string name="notifications_priority">Do Not Disturb overridden</string>
-    <!-- App notification summary divider [CHAR LIMIT=40] -->
-    <string name="notifications_summary_divider">\u00A0/\u00A0</string>
-    <!-- App notification summary for advanced controls -->
-    <string name="notification_summary_level">Level %d</string>
-    <!-- App notification summary channel divider-->
-    <string name="notification_summary_channel"><xliff:g id="channel_name">%1$s</xliff:g> \u2022 <xliff:g id="group_name">%2$s</xliff:g></string>
 
     <!-- Permissions preference summary [CHAR LIMIT=40] -->
     <plurals name="notifications_categories_off">
@@ -9724,12 +9131,6 @@
         <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categories turned off</item>
     </plurals>
 
-    <!-- Permissions preference summary [CHAR LIMIT=40] -->
-    <plurals name="permissions_summary">
-        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
-        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
-    </plurals>
-
     <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
     <plurals name="runtime_permissions_additional_count">
         <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> additional permission</item>
@@ -9776,28 +9177,12 @@
     <!-- Label for showing instant apps in list [CHAR LIMIT=40] -->
     <string name="filter_instant_apps">Instant apps</string>
 
-    <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_all_apps">Apps: All</string>
     <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
     <string name="filter_notif_blocked_apps">Turned off</string>
-    <!-- Label for showing categories with urgent notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_urgent_channels">Categories: Urgent importance</string>
-    <!-- Label for showing categories with low importance notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_low_channels">Categories: Low importance</string>
-    <!-- Label for showing categories with blocked notifications in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_blocked_channels">Categories: Turned off</string>
-    <!-- Label for showing categories with notifications that override dnd in list [CHAR LIMIT=30] -->
-    <string name="filter_notif_dnd_channels">Categories: Overrides Do Not Disturb</string>
 
     <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
     <string name="advanced_apps">Advanced</string>
 
-    <!-- Title for application configuration settings [CHAR LIMIT=30] -->
-    <string name="configure_apps">Configure apps</string>
-
-    <!-- Warning toast shown when data usage screen can't find specified app -->
-    <string name="unknown_app">Unknown app</string>
-
     <!-- Label for list that shows all permissions -->
     <string name="app_permissions">Permission manager</string>
     <!-- Summary of permissions currently granted to apps [CHAR LIMIT=60] -->
@@ -9823,9 +9208,6 @@
     <!-- Summary of an app that can open several domain's URLs [CHAR LIMIT=45] -->
     <string name="domain_urls_summary_some">Open <xliff:g id="domain" example="mail.google.com">%s</xliff:g> and other URLs</string>
 
-    <!-- Summary of open web links settings when no app can open supported links [CHAR LIMIT=NONE] -->
-    <string name="domain_urls_apps_summary_off">No app opening supported links</string>
-
     <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
     <string name="app_link_open_always">Allow app to open supported links</string>
 
@@ -9844,12 +9226,6 @@
     <!-- Footer of open supported links settings [CHAR LIMIT=NONE] -->
     <string name="open_supported_links_footer">App claims to handle following links:</string>
 
-    <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
-    <string name="default_apps_title">Default</string>
-
-    <!-- Title for Default Apps settings for work [CHAR LIMIT=30] -->
-    <string name="default_for_work">Default for work</string>
-
     <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
     <string name="assist_and_voice_input_title">Assist &amp; voice input</string>
 
@@ -9859,44 +9235,18 @@
     <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
     <string name="default_digital_assistant_title">Default digital assistant app</string>
 
-    <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
-    <string name="assistant_security_warning_title">
-        Make <xliff:g id="assistant_app_name">%s</xliff:g> your assistant?
-    </string>
-
-    <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
-         displayed as a dialog message when the user selects an assistant. -->
-    <string name="assistant_security_warning">The assistant will be able to read information about
-        apps in use on your system, including information visible on your screen or accessible
-        within the apps.</string>
-
     <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
     <string name="assistant_security_warning_agree">Agree</string>
 
-    <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
-    <string name="assistant_security_warning_disagree">Disagree</string>
-
-    <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
-    <string name="choose_voice_input_title">Choose voice input</string>
-
     <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
     <string name="default_browser_title">Browser app</string>
 
-    <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
-    <string name="default_browser_title_none">No default Browser</string>
-
     <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
     <string name="default_phone_title">Phone app</string>
 
-    <!-- Label of default app for current setting [CHAR LIMIT=40] -->
-    <string name="default_app">(Default)</string>
-
     <!-- Label of system app for current setting -->
     <string name="system_app">(System)</string>
 
-    <!-- Label of system and default app for current setting -->
-    <string name="system_default_app">(System default)</string>
-
     <!-- Title of app storage screen [CHAR LIMIT=30] -->
     <string name="apps_storage">Apps storage</string>
 
@@ -9906,9 +9256,6 @@
     <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
     <string name="permit_usage_access">Permit usage access</string>
 
-    <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
-    <string name="app_usage_preference">App usage preferences</string>
-
     <!-- Link title to show stats about how much time user spent in an app [CHAR LIMIT=45] -->
     <string name="time_spent_in_app_pref_title">Screen time</string>
 
@@ -9918,9 +9265,6 @@
     <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
     <string name="memory_settings_title">Memory</string>
 
-    <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
-    <string name="memory_details_title">Memory details</string>
-
     <!-- Description of app always running [CHAR LIMIT=45] -->
     <string name="always_running">Always running (<xliff:g id="percentage" example="5%">%s</xliff:g>)</string>
 
@@ -9930,36 +9274,12 @@
     <!-- Description of app rarely running [CHAR LIMIT=45] -->
     <string name="rarely_running">Rarely running (<xliff:g id="percentage" example="5%">%s</xliff:g>)</string>
 
-    <!-- Maximum memory usage key [CHAR LIMIT=25] -->
-    <string name="memory_max_use">Maximum</string>
-
-    <!-- Average memory usage key [CHAR LIMIT=25] -->
-    <string name="memory_avg_use">Average</string>
-
-    <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
-    <string name="memory_max_desc">Maximum <xliff:g id="memory" example="30MB">%1$s</xliff:g></string>
-
-    <!-- Average memory used by an app [CHAR LIMIT=25] -->
-    <string name="memory_avg_desc">Average <xliff:g id="memory" example="30MB">%1$s</xliff:g></string>
-
     <!-- Formatting for memory description [CHAR LIMIT=25] -->
     <string name="memory_use_running_format"><xliff:g id="memory" example="30MB">%1$s</xliff:g> / <xliff:g id="running" example="Always running">%2$s</xliff:g></string>
 
-    <!-- Label for process [CHAR LIMIT=25] -->
-    <string name="process_format"><xliff:g id="app_name" example="Settings">%1$s</xliff:g> (<xliff:g id="count" example="3">%2$d</xliff:g>)</string>
-
     <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
     <string name="high_power_apps">Battery optimization</string>
 
-    <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
-    <string name="additional_battery_info">Usage alerts</string>
-
-    <!-- Label for menu to show battery usage in the device [CHAR LIMIT=45] -->
-    <string name="show_all_apps">Show full device usage</string>
-
-    <!-- Label for menu to show app usage [CHAR LIMIT=30] -->
-    <string name="hide_extra_apps">Show app usage</string>
-
     <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
     <string name="high_power_filter_on">Not optimized</string>
 
@@ -9972,9 +9292,6 @@
     <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
     <string name="high_power_system">Battery optimization not available</string>
 
-    <!-- Description of high power switch [CHAR LIMIT=NONE] -->
-    <string name="high_power_desc">Don\u2019t apply battery optimization. May drain your battery more quickly.</string>
-
     <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
     <string name="high_power_prompt_title">Let app always run in background?</string>
 
@@ -9990,21 +9307,6 @@
     <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
     <string name="no_battery_summary">No battery use since last full charge</string>
 
-    <!-- Summary for app with no battery usage for past 24 hours [CHAR LIMIT=NONE] -->
-    <string name="no_battery_summary_24hr">No battery use for past 24 hours</string>
-
-    <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
-    <string name="app_notification_preferences">App settings</string>
-
-    <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
-    <string name="system_ui_settings">Show SystemUI Tuner</string>
-
-    <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
-    <string name="additional_permissions">Additional permissions</string>
-
-    <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
-    <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string>
-
     <!-- Title of dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
     <string name="share_remote_bugreport_dialog_title">Share bug report?</string>
     <!-- Message of a dialog shown to ask for user consent for sharing a bugreport that was requested remotely by the IT administrator. -->
@@ -10022,10 +9324,6 @@
          select what the USB connection for this device should be used for. This choice
          is for charging only. -->
     <string name="usb_use_charging_only">No data transfer</string>
-    <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
-         user select what the USB connection for this device should be used for. This choice
-         is for charging only. -->
-    <string name="usb_use_charging_only_desc">Just charge this device</string>
     <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for powering the other device only. -->
@@ -10034,10 +9332,6 @@
          select what the USB connection for this device should be used for. This choice
          is for transferring files via MTP. -->
     <string name="usb_use_file_transfers">File Transfer</string>
-    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
-         select what the USB connection for this device should be used for. This choice
-         is for transferring files via MTP. -->
-    <string name="usb_use_file_transfers_desc">Transfer files to another device</string>
     <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
@@ -10050,10 +9344,6 @@
          transcoding files to compatible formats before transferring them from the device to PC.
          [CHAR LIMIT=NONE] -->
     <string name="usb_transcode_files_summary">Videos will play on more media players, but quality may be reduced</string>
-    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
-         select what the USB connection for this device should be used for. This choice
-         is for transferring photos via PTP. -->
-    <string name="usb_use_photo_transfers_desc">Transfer photos or files if MTP is not supported (PTP)</string>
     <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for USB tethering. -->
@@ -10062,10 +9352,6 @@
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
     <string name="usb_use_MIDI">MIDI</string>
-    <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
-         select what the USB connection for this device should be used for. This choice
-         is for entering MIDI mode. -->
-    <string name="usb_use_MIDI_desc">Use this device as MIDI</string>
     <!-- The title used in a dialog which lets the user select what the USB connection
          for this device should be used for. These options are more commonly used.
          Choices are usb_use_file_transfer.-->
@@ -10131,9 +9417,6 @@
     <!-- Settings item title for background check prefs [CHAR LIMIT=35] -->
     <string name="background_check_pref">Background check</string>
 
-    <!-- Settings screen title for background check prefs [CHAR LIMIT=35] -->
-    <string name="background_check_title">Full background access</string>
-
     <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
     <string name="assist_access_context_title">Use text from screen</string>
 
@@ -10238,9 +9521,6 @@
     <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
     <string name="ignore_optimizations_off_desc">Recommended for better battery life</string>
 
-    <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
-    <string name="ignore_optimizations_title">Allow <xliff:g id="app" example="Tasker">%s</xliff:g> to ignore battery optimizations?</string>
-
     <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
     <string name="app_list_preference_none">None</string>
 
@@ -10248,18 +9528,11 @@
     <string name="work_profile_usage_access_warning">Turning off usage access for this app doesn\'t
         prevent your admin from tracking data usage for apps in your work profile</string>
 
-    <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
-    <string name="accessibility_lock_screen_progress"><xliff:g id="count" example="1">%1$d</xliff:g> of <xliff:g id="count" example="1">%2$d</xliff:g> characters used</string>
-
     <!-- System Alert Window settings -->
     <!-- Title of display overlay screen [CHAR LIMIT=30] -->
     <string name="draw_overlay">Display over other apps</string>
     <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
     <string name="system_alert_window_settings">Display over other apps</string>
-    <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
-    <string name="system_alert_window_apps_title">Apps</string>
-    <!-- Title for the apps that are allowed to display over other apps [CHAR LIMIT=60] -->
-    <string name="system_alert_window_access_title">Display over other apps</string>
     <!-- Label for setting which controls whether app can display over other apps [CHAR LIMIT=45] -->
     <string name="permit_draw_overlay">Allow display over other apps</string>
     <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
@@ -10289,9 +9562,6 @@
     <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
     <string name="overlay_settings">Display over other apps</string>
 
-    <!-- Summary of number of apps currently can display over other apps [CHAR LIMIT=60] -->
-    <string name="system_alert_window_summary"><xliff:g id="count" example="10">%1$d</xliff:g> of <xliff:g id="count" example="10">%2$d</xliff:g> apps allowed to display over other apps</string>
-
     <!-- Label for showing apps that can display over other apps [CHAR LIMIT=45] -->
     <string name="filter_overlay_apps">Apps with permission</string>
 
@@ -10309,8 +9579,6 @@
     <string name="write_settings">Modify system settings</string>
     <!-- Keyword for WRITE_SETTINGS -->
     <string name="keywords_write_settings">write modify system settings</string>
-    <!-- Summary of number of apps currently can write system settings [CHAR LIMIT=60] -->
-    <string name="write_settings_summary"><xliff:g id="count" example="10">%1$d</xliff:g> of <xliff:g id="count" example="10">%2$d</xliff:g> apps allowed to modify system settings</string>
 
     <!-- Label for showing apps that can install other apps [CHAR LIMIT=45] -->
     <string name="filter_install_sources_apps">Can install other apps</string>
@@ -10324,10 +9592,6 @@
     <string name="permit_write_settings">Allow modifying system settings</string>
     <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
     <string name="write_settings_description">This permission allows an app to modify system settings.</string>
-    <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
-    <string name="write_settings_on">Yes</string>
-    <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
-    <string name="write_settings_off">No</string>
     <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
     <string name="external_source_switch_title">Allow from this source</string>
 
@@ -10337,12 +9601,6 @@
     <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
     <string name="camera_gesture_desc">Open the camera app by twisting your wrist twice</string>
 
-    <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
-    <string name="camera_double_tap_power_gesture_title">Press power button twice for camera</string>
-
-    <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
-    <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
-
     <!-- Title of setting that controls screen zoom (e.g. how large interface elements appear). [CHAR LIMIT=40] -->
     <string name="screen_zoom_title">Display size</string>
     <!-- Short summary for Magnification gesture. Lets the user know that this makes items on screen larger or smaller. Appears in the accessibility portion of Setup Wizard. [CHAR LIMIT=NONE] -->
@@ -10356,50 +9614,18 @@
     <!-- Description for the button that makes interface elements larger. [CHAR_LIMIT=NONE] -->
     <string name="screen_zoom_make_larger_desc">Make larger</string>
 
-    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
-    <string name="screen_zoom_conversation_icon_alex">A</string>
-    <!-- Name Initial shown in the conversation message icon. [CHAR LIMIT=1] -->
-    <string name="screen_zoom_conversation_icon_pete">P</string>
-    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
-    <string name="screen_zoom_conversation_message_1">Hi Pete!</string>
-    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
-    <string name="screen_zoom_conversation_message_2">Hey, want to grab coffee and catch up today?</string>
-    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
-    <string name="screen_zoom_conversation_message_3">Sounds great. I know of a good place not too far from here.</string>
-    <!-- Conversation message body of the messaging app preview screen. [CHAR LIMIT=NONE] -->
-    <string name="screen_zoom_conversation_message_4">Perfect!</string>
-    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
-    <string name="screen_zoom_conversation_timestamp_1">Tue 6:00PM</string>
-    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
-    <string name="screen_zoom_conversation_timestamp_2">Tue 6:01PM</string>
-    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
-    <string name="screen_zoom_conversation_timestamp_3">Tue 6:02PM</string>
-    <!-- Conversation message timestamp of the messaging app preview screen. [CHAR LIMIT=20] -->
-    <string name="screen_zoom_conversation_timestamp_4">Tue 6:03PM</string>
-
     <!-- Wi-Fi state - Disconnected [CHAR LIMIT=NONE] -->
     <string name="disconnected">Not connected</string>
 
     <!-- Physical keyboard state - Disconnected [CHAR LIMIT=NONE] -->
     <string name="keyboard_disconnected">Not connected</string>
 
-    <!-- Summary of data usage [CHAR LIMIT=NONE] -->
-    <string name="data_usage_summary_format"><xliff:g id="amount" example="50%">%1$s</xliff:g> of data used</string>
-
-    <!-- Summary of data usage [CHAR LIMIT=NONE] -->
-    <string name="data_usage_wifi_format"><xliff:g id="amount" example="50%">^1</xliff:g> used on Wi\u2011Fi</string>
-
-    <!-- Summary of notifications when no apps are blocked [CHAR LIMIT=NONE] -->
-    <string name="notification_summary_none">On for all apps</string>
-
     <!-- Summary of apps [CHAR LIMIT=NONE] -->
     <string name="apps_summary"><xliff:g id="count" example="24">%1$d</xliff:g> apps installed</string>
 
     <!-- Summary of storage usage [CHAR LIMIT=NONE] -->
     <string name="storage_summary"><xliff:g id="percentage" example="54%">%1$s</xliff:g> used - <xliff:g id="free_space" example="32GB">%2$s</xliff:g> free</string>
 
-    <!-- Summary of display with screen sleep timeout [CHAR LIMIT=NONE] -->
-    <string name="display_summary">Sleep after <xliff:g id="timeout_description" example="10 minutes">%1$s</xliff:g> of inactivity</string>
     <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="display_dashboard_summary">Dark theme, font size, brightness</string>
 
@@ -10409,12 +9635,6 @@
     <!-- Summary of User settings [CHAR LIMIT=NONE] -->
     <string name="users_summary">Signed in as <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
 
-    <!-- Summary of payment screen [CHAR LIMIT=NONE] -->
-    <string name="payment_summary"><xliff:g id="app_name" example="Payment App">%1$s</xliff:g> is default</string>
-
-    <!-- Backup disabled summary [CHAR LIMIT=NONE] -->
-    <string name="backup_disabled">Back up disabled</string>
-
     <!-- Summary of Android version info [CHAR LIMIT=NONE] -->
     <string name="android_version_summary">Updated to Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
     <!-- Summary of Android version info (when there is a pending upgrade available) [CHAR LIMIT=NONE] -->
@@ -10547,27 +9767,9 @@
     <!-- Summary of condition that gray scale is on [CHAR LIMIT=NONE] -->
     <string name="condition_grayscale_summary">Display only in gray color</string>
 
-    <!-- Summary for the condition section on the dashboard, representing number of conditions. [CHAR LIMIT=10] -->
-    <string name="condition_summary" translatable="false"><xliff:g name="count" example="3">%1$d</xliff:g></string>
-
     <!-- Content description for condition footer button. In talkback mode, double tapping will cause condition list to collapse [CHAR LIMIT=NONE]-->
     <string name="homepage_condition_footer_content_description">Collapse</string>
 
-    <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
-    <string name="suggestions_title_v2">Suggested for You</string>
-
-    <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
-    <string name="suggestions_title">Suggestions</string>
-
-    <!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
-    <string name="suggestions_summary">+<xliff:g name="count" example="3">%1$d</xliff:g></string>
-
-    <!-- Title for the suggestions section on the dashboard, representing number of suggestions to show when expanded. [CHAR LIMIT=10] -->
-    <string name="suggestions_more_title">+<xliff:g name="count" example="3">%1$d</xliff:g> more</string>
-
-    <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
-    <string name="suggestion_remove">Remove</string>
-
     <!-- Name of the setting to change the display's color temperature -->
     <string name="color_temperature">Cool color temperature</string>
 
@@ -10634,9 +9836,6 @@
     <!-- Format for a summary describing the amount of data before the user is warned or limited [CHAR LIMIT=NONE] -->
     <string name="cell_data_warning_and_limit"><xliff:g name="amount" example="1 GB">^1</xliff:g> data warning / <xliff:g name="amount" example="2 GB">^2</xliff:g> data limit</string>
 
-    <!-- Summary describing when the billing cycle for their phone carrier starts [CHAR LIMIT=NONE] -->
-    <string name="billing_cycle_fragment_summary">Monthly on day <xliff:g name="day_of_month" example="17">%1$s</xliff:g></string>
-
     <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
     <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
 
@@ -10683,9 +9882,6 @@
     <!-- Alternative data usage title text for Wi-Fi only mode [CHAR LIMIT=30] -->
     <string name="data_usage_wifi_title">Wi\u2011Fi data</string>
 
-    <!-- Data usage remaining string [CHAR LIMIT=30] -->
-    <string name="data_used"><xliff:g name="bytes" example="2 GB">^1</xliff:g> used</string>
-
     <!-- Data usage remaining string [CHAR LIMIT=13] -->
     <string name="data_used_formatted"><xliff:g name="value" example="500">^1</xliff:g> <xliff:g name="units" example="GB">^2</xliff:g> used</string>
 
@@ -10752,21 +9948,6 @@
     <!-- Button to switch the default home app [CHAR LIMIT=60] -->
     <string name="home_app">Home app</string>
 
-    <!-- No default home set summary [CHAR LIMIT=NONE] -->
-    <string name="no_default_home">No default Home</string>
-
-    <!-- Title of the preference controlling whether the device encryption password/PIN/Pattern must be entered before being able to start the device. [CHAR LIMIT=60]-->
-    <string name="lockpattern_settings_require_cred_before_startup">Secure start-up</string>
-
-    <!-- Summary of the preference controlling whether the device encryption *pattern* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->
-    <string name="lockpattern_settings_require_pattern_before_startup_summary">Require pattern to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>
-
-    <!-- Summary of the preference controlling whether the device encryption *PIN* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->
-    <string name="lockpattern_settings_require_pin_before_startup_summary">Require PIN to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>
-
-    <!-- Summary of the preference controlling whether the device encryption *password* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->
-    <string name="lockpattern_settings_require_password_before_startup_summary">Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>
-
     <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=46] -->
     <string name="suggestion_additional_fingerprints">Add another fingerprint</string>
 
@@ -10776,15 +9957,6 @@
     <!-- Summary of battery saver when it is off and scheduled [CHAR LIMIT=NONE] -->
     <string name="battery_saver_off_scheduled_summary">Will turn on at <xliff:g id="battery_percentage" example="15%">%1$s</xliff:g></string>
 
-    <!--  Battery saver: Label for button that will turn on battery saver. [CHAR LIMIT=30] -->
-    <string name="battery_saver_button_turn_on">Turn on now</string>
-
-    <!--  Battery saver: Label for button that will turn off battery saver. [CHAR LIMIT=30] -->
-    <string name="battery_saver_button_turn_off">Turn off now</string>
-
-    <!-- [CHAR_LIMIT=NONE] Label for when app is ignoring battery optimizations -->
-    <string name="not_battery_optimizing">Not using battery optimization</string>
-
     <!-- Preference title for battery usage list page[CHAR_LIMIT=50]-->
     <string name="app_battery_usage_title">App battery usage</string>
 
@@ -10800,9 +9972,6 @@
     <!-- Filter title for battery restricted[CHAR_LIMIT=50]-->
     <string name="filter_battery_restricted_title">Restricted</string>
 
-    <!-- Text for the setting on whether you can type text into notifications without unlocking the device. -->
-    <string name="lockscreen_remote_input">If device is locked, prevent typing replies or other text in notifications</string>
-
     <!-- [CHAR LIMIT=30] Label for setting to control the default spell checker -->
     <string name="default_spell_checker">Default spell checker</string>
 
@@ -10815,8 +9984,6 @@
     <!-- [CHAR LIMIT=30] Label for the placeholder of the current spell checker name.  Used when no spell checker is currently selected. -->
     <string name="spell_checker_not_selected">Not selected</string>
 
-    <!-- Notification log debug tool: missing title -->
-    <string name="notification_log_no_title">(none)</string>
     <!-- Notification log debug tool: delimiter between header and field data -->
     <string name="notification_log_details_delimiter">": "</string>
     <!-- Notification log debug tool: header: package name -->
@@ -10827,12 +9994,8 @@
     <string name="notification_log_details_group">group</string>
     <!-- Notification log debug tool: header: notification group summary suffix -->
     <string name="notification_log_details_group_summary"> (summary)</string>
-    <!-- Notification log debug tool: header: notification visibility -->
-    <string name="notification_log_details_visibility">visibility</string>
     <!-- Notification log debug tool: header: notification public version -->
     <string name="notification_log_details_public_version">publicVersion</string>
-    <!-- Notification log debug tool: header: notification priority -->
-    <string name="notification_log_details_priority">priority</string>
     <!-- Notification log debug tool: header: notification importance -->
     <string name="notification_log_details_importance">importance</string>
     <!-- Notification log debug tool: header: notification importance explanation -->
@@ -10864,16 +10027,11 @@
     <!-- Notification log debug tool: header: notification alert info -->
     <string name="notification_log_details_alerted">notification alerted</string>
     <string name="notification_log_channel">channel</string>
-    <!-- Notification log debug tool: the word 'none' -->
-    <string name="notification_log_details_none">none</string>
     <!-- Notification log debug tool: missing ranking information -->
     <string name="notification_log_details_ranking_null">Ranking object is missing.</string>
     <!-- Notification log debug tool: the word 'none' -->
     <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
-    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off customizations for a given category.-->
-    <string name="theme_customization_device_default">Device default</string>
-
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
     <string name="display_cutout_emulation">Display cutout</string>
 
@@ -10910,8 +10068,6 @@
     <string name="notification_suggestion_title">Control info on lock screen</string>
     <!-- Summary of notification suggestion during optional steps of setup. [CHAR_LIMIT=80] -->
     <string name="notification_suggestion_summary">Show or hide notification content</string>
-    <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
-    <string name="page_tab_title_summary">All</string>
     <!-- Setting tab title for support setting options. [CHAR LIMIT=25] -->
     <string name="page_tab_title_support">Tips &amp; support</string>
 
@@ -11000,43 +10156,21 @@
     <!-- Used in the storage manager settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
     <string name="automatic_storage_manager_primary_switch_title">Use Storage manager</string>
 
-    <!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->
-    <string name="deletion_helper_automatic_title">Automatic</string>
-
-    <!-- Category title for the manual settings in the storage manager settings. [CHAR LIMIT=40] -->
-    <string name="deletion_helper_manual_title">Manual</string>
-
-    <!-- Preference menu title for accessing the deletion helper from the storage manager settings. [CHAR LIMIT=30]-->
-    <string name="deletion_helper_preference_title">Free up space now</string>
-
     <!-- Preference title for gesture settings [CHAR LIMIT=40 BACKUP_MESSAGE_ID:5280023307132819052]-->
     <string name="gesture_preference_title">Gestures</string>
 
-    <!-- Preference summary for gesture settings (phone) [CHAR LIMIT=NONE]-->
-    <string name="gesture_preference_summary" product="default">Quick gestures to control your phone</string>
-    <!-- Preference summary for gesture settings (tablet) [CHAR LIMIT=NONE]-->
-    <string name="gesture_preference_summary" product="tablet">Quick gestures to control your tablet</string>
-    <!-- Preference summary for gesture settings (device) [CHAR LIMIT=NONE]-->
-    <string name="gesture_preference_summary" product="device">Quick gestures to control your device</string>
-
     <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
     <string name="double_tap_power_for_camera_title">Quickly open camera</string>
 
     <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
     <string name="double_tap_power_for_camera_summary">To quickly open camera, press the power button twice. Works from any screen.</string>
 
-    <!-- Title for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
-    <string name="double_tap_power_for_camera_suggestion_title">Open camera quickly</string>
-
     <!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->
     <string name="double_twist_for_camera_mode_title">Flip camera for selfie</string>
 
     <!-- Summary text for double twist for camera mode  [CHAR LIMIT=160]-->
     <string name="double_twist_for_camera_mode_summary"></string>
 
-    <!-- Title for settings suggestion for double twist for camera [CHAR LIMIT=60] -->
-    <string name="double_twist_for_camera_suggestion_title">Take selfies faster</string>
-
     <!-- Title text for system navigation [CHAR LIMIT=60] -->
     <string name="system_navigation_title">System navigation</string>
 
@@ -11044,10 +10178,6 @@
     <string name="swipe_up_to_switch_apps_title">2-button navigation</string>
     <!-- Summary text for swipe up to switch apps  [CHAR LIMIT=250] -->
     <string name="swipe_up_to_switch_apps_summary">To switch apps, swipe up on the Home button. To see all apps, swipe up again. To go back, tap the back button.</string>
-    <!-- Title for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
-    <string name="swipe_up_to_switch_apps_suggestion_title">Try the new Home button</string>
-    <!-- Summary for settings suggestion for swipe up to switch apps [CHAR LIMIT=60] -->
-    <string name="swipe_up_to_switch_apps_suggestion_summary">Turn on the new gesture to switch apps</string>
 
     <!-- Preference title for "Safety & emergency" settings page [CHAR LIMIT=60]-->
     <string name="emergency_settings_preference_title">Safety &amp; emergency</string>
@@ -11068,12 +10198,6 @@
     <!-- Search keywords for System Navigation settings. [CHAR_LIMIT=NONE]-->
     <string name="keywords_system_navigation">system navigation, 2 button navigation, 3 button navigation, gesture navigation, swipe</string>
 
-    <!-- Message for the alert dialog which says that the current default home app does not support gesture navigation. [CHAR LIMIT=NONE] -->
-    <string name="gesture_not_supported_dialog_message">Not supported by your default home app, <xliff:g id="default_home_app" example="Pixel Launcher">%s</xliff:g></string>
-
-    <!-- Positive button for the alert dialog when gesture nav not supported by launcher [CHAR LIMIT=60] -->
-    <string name="gesture_not_supported_positive_button">Switch default home app</string>
-
     <!-- Title for setting category that is shown to enable invoking digital assistant with swipe. [CHAR LIMIT=60] -->
     <string name="assistant_gesture_category_title">Digital assistant</string>
     <!-- Title text for swiping from bottom corners to invoke the digital assistant app. [CHAR LIMIT=60] -->
@@ -11086,9 +10210,6 @@
     <!-- Summary text for holding a long press on Home button to invoke the digital assistant app. [CHAR LIMIT=NONE] -->
     <string name="assistant_long_press_home_gesture_summary">Press and hold the Home button to invoke digital assistant app.</string>
 
-    <!-- Content description for the Information icon [CHAR LIMIT=30] -->
-    <string name="information_label">Information</string>
-
     <!-- Label on the left side of sensitivity adjustment slider [CHAR LIMIT=30] -->
     <string name="low_label">Low</string>
     <!-- Label on the right side of sensitivity adjustment slider [CHAR LIMIT=30] -->
@@ -11238,8 +10359,6 @@
 
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because the bootloader has been unlocked [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
-    <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
-    <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the internet first</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity or the device is locked by the carrier [CHAR_LIMIT=60] -->
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the internet or contact your carrier</string>
     <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
@@ -11269,15 +10388,8 @@
     <!-- Accounts for section header [CHAR LIMIT=30] -->
     <string name="account_for_section_header">Accounts for <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>
 
-    <!-- Configure section header [CHAR LIMIT=30] -->
-    <string name="configure_section_header">Configure</string>
-
     <!-- Switch label to enable auto sync account [CHAR LIMIT=60] -->
     <string name="auto_sync_account_title">Automatically sync app data</string>
-    <!-- Switch label to enable auto sync personal account [CHAR LIMIT=60] -->
-    <string name="auto_sync_personal_account_title">Automatically sync personal data</string>
-    <!-- Switch label to enable auto sync work account [CHAR LIMIT=60] -->
-    <string name="auto_sync_work_account_title">Automatically sync work data</string>
     <!-- Switch summary to enable auto sync account [CHAR LIMIT=NONE] -->
     <string name="auto_sync_account_summary">Let apps refresh data automatically</string>
     <!-- Preference label to sync account [CHAR LIMIT=60] -->
@@ -11947,19 +11059,6 @@
     <!-- Text for Network world mode GSM LTE [CHAR LIMIT=NONE] -->
     <string name="network_world_mode_gsm_lte" translatable="false">LTE / GSM / UMTS</string>
 
-    <!-- Available networks screen title/heading [CHAR LIMIT=NONE] -->
-    <string name="label_available">Available networks</string>
-    <!-- Mobile network settings screen, toast when searching for available networks [CHAR LIMIT=NONE] -->
-    <string name="load_networks_progress">Searching\u2026</string>
-    <!-- Available networks screen, toast when registering on a specific network [CHAR LIMIT=NONE] -->
-    <string name="register_on_network">Registering on <xliff:g id="network" example="Verizon">%s</xliff:g>\u2026</string>
-    <!-- Available networks screen, toast when SIM card isn't allowed on a network [CHAR LIMIT=NONE] -->
-    <string name="not_allowed">Your SIM card doesn\u2019t allow a connection to this network.</string>
-    <!-- Available networks screen, toast when unable to connect to a network temporarily [CHAR LIMIT=NONE] -->
-    <string name="connect_later">Can\u2019t connect to this network right now. Try again later.</string>
-    <!-- Available networks screen, toast when registered on a specific network [CHAR LIMIT=NONE] -->
-    <string name="registration_done">Registered on network.</string>
-
     <!-- Available networks screen, name of switch button for whether to select network automatically [CHAR LIMIT=NONE] -->
     <string name="select_automatically">Automatically select network</string>
 
@@ -12021,14 +11120,6 @@
          such as calls, SMS, or data when multiple SIMs are present, but is not currently the
           default SIM for any of those services. [CHAR LIMIT=50] -->
     <string name="subscription_available">Available</string>
-    <!-- Network & internet page. Summary indicating that a SIM is configured and may be used for
-         some services, and that network is currently in range but not being used. For instance, it
-         may be able to provide a mobile data connection that we aren't using because we're already
-         connected to wifi. [CHAR LIMIT=50] -->
-    <string name="mobile_network_in_range">In range</string>
-    <!-- Network & internet page. Summary indicating that a SIM is configured and may be used for
-         some services, but the network not currently in range. [CHAR LIMIT=50] -->
-    <string name="mobile_network_not_in_range">Not in range</string>
 
     <!-- Title of item shown at the bottom of the page listing multiple mobile service
          subscriptions; tapping it leads to a UI to add more [CHAR LIMIT=40] -->
@@ -12075,48 +11166,16 @@
         Tap to activate <xliff:g id="carrier" example="T-mobile">%1$s</xliff:g>
     </string>
 
-    <!-- Title for a confirmation dialog when the user is enabling an eSIM subscription and there
-         is already another active eSIM subscription which will need to be disabled if they proceed.
-         [CHAR LIMIT=60] -->
-    <string name="mobile_network_esim_swap_confirm_title">
-        Switch to <xliff:g id="carrier" example="T-mobile">%1$s</xliff:g>?
-    </string>
-    <!-- Body of a confirmation dialog when the user is enabling an eSIM subscription and there
-         is already another active eSIM subscription which will need to be disabled if they proceed.
-         [CHAR LIMIT=NONE] -->
-    <string name="mobile_network_esim_swap_confirm_body">
-        Only one downloaded SIM can be active at a time.\n\nSwitching to
-        <xliff:g id="carrier1" example="T-mobile">%1$s</xliff:g> won\u0027t cancel your
-        <xliff:g id="carrier2" example="Verizon">%2$s</xliff:g> service.
-    </string>
-    <!-- Ok button label on confirmation dialog when the user is enabling an eSIM subscription and
-         there is already another active eSIM subscription which will need to be disabled if they
-         proceed. [CHAR LIMIT=25] -->
-    <string name="mobile_network_esim_swap_confirm_ok">
-        Switch to <xliff:g id="carrier" example="T-mobile">%1$s</xliff:g>
-    </string>
-
     <!-- Mobile network details page. Label for an option that lets the user delete an eSIM from
          the device. [CHAR LIMIT=60] -->
     <string name="mobile_network_erase_sim">Erase SIM</string>
 
-    <!-- Title of a dialog indicating that an error ocurred when deleting an eSIM from the device
-         [CHAR LIMIT=60] -->
-    <string name="mobile_network_erase_sim_error_dialog_title">Can\u2019t erase SIM</string>
-    <!-- Body of a dialog indicating that an error ocurred when deleting an eSIM from the device
-         [CHAR LIMIT=NONE] -->
-    <string name="mobile_network_erase_sim_error_dialog_body">
-        This SIM can\u2019t be erased due to an error.\n\nRestart your device and try again.
-    </string>
-
     <!-- Title for preferred network type [CHAR LIMIT=NONE] -->
     <string name="preferred_network_mode_title">Preferred network type</string>
     <!-- Summary for preferred network type [CHAR LIMIT=NONE] -->
     <string name="preferred_network_mode_summary">Change the network operating mode</string>
     <!-- Dialog title for preferred network type [CHAR LIMIT=NONE] -->
     <string name="preferred_network_mode_dialogtitle">Preferred network type</string>
-    <!-- Mobile network settings screen, name of the option to manage carrier profiles on devices which support embedded carrier profiles [CHAR LIMIT=NONE] -->
-    <string name="carrier_settings_euicc">Carrier</string>
     <!-- Mobile network settings screen, a string showing the version of carrier settings for this
          subscription [CHAR LIMIT=NONE] -->
     <string name="carrier_settings_version">Carrier settings version</string>
@@ -12135,8 +11194,6 @@
 
     <!-- Mobile network settings screen, name for network operator category [CHAR LIMIT=NONE] -->
     <string name="network_operator_category">Network</string>
-    <!-- Available networks screen, name of button when user wants to select network manually [CHAR LIMIT=NONE] -->
-    <string name="network_select_title">Network</string>
 
     <!-- Title for CDMA subscription [CHAR LIMIT=50] -->
     <string name="cdma_subscription_title">CDMA subscription</string>
@@ -12164,8 +11221,6 @@
 
     <!-- See more items in contextual homepage [CHAR LIMIT=30]-->
     <string name="see_more">See more</string>
-    <!-- See less items in contextual homepage [CHAR LIMIT=30]-->
-    <string name="see_less">See less</string>
 
     <!-- Strings for toggling subscriptions dialog activity -->
     <!-- Title of confirmation dialog asking the user if they want to enable subscription. [CHAR_LIMIT=NONE] -->
@@ -12216,10 +11271,6 @@
     <string name="sim_action_enable_dsds_text">This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\".</string>
     <!-- Ask the user whether to restart device. [CHAR LIMIT=NONE] -->
     <string name="sim_action_restart_title">Restart device?</string>
-    <!-- Tell the user that in order to enable DSDS mode, the phone needs to restart. [CHAR LIMIT=NONE] -->
-    <string name="sim_action_restart_text">To get started, restart your device. Then you can add another SIM.</string>
-    <!-- Button on a dialog to confirm SIM operations. [CHAR LIMIT=30] -->
-    <string name="sim_action_continue">Continue</string>
     <!-- Button on a dialog to confirm SIM operations. [CHAR LIMIT=30] -->
     <string name="sim_action_yes">Yes</string>
     <!-- User confirms reboot the phone. [CHAR LIMIT=30] -->
@@ -12232,8 +11283,6 @@
     <string name="sim_switch_button">Switch</string>
     <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->
     <string name="dsds_activation_failure_title">Can\u2019t activate SIM</string>
-    <!-- Body text of DSDS activation failure dialog. Users could reinsert the SIM card or reboot to recover. [CHAR LIMIT=NONE] -->
-    <string name="dsds_activation_failure_body_msg1">Remove the SIM and insert it again. If the problem continues, restart your device.</string>
     <!-- Body text of DSDS activation failure dialog. Users could toggle the selected SIM again or reboot to recover. [CHAR LIMIT=NONE] -->
     <string name="dsds_activation_failure_body_msg2">Try turning on the SIM again. If the problem continues, restart your device.</string>
 
@@ -12270,8 +11319,6 @@
     <string name="choose_sim_activating">Activating<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
     <!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] -->
     <string name="choose_sim_could_not_activate">Couldn\u2019t be activated right now</string>
-    <!-- String indicating that the number for the specified profile is unknown [CHAR LIMIT=NONE] -->
-    <string name="choose_sim_item_summary_unknown">Unknown number</string>
 
     <!-- Strings for switch SIM confirmation dialog. -->
     <!--  The title text of switch SIM confirmation dialog. [CHAR LIMIT=NONE] -->
@@ -12334,15 +11381,6 @@
     <!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
     <string name="settings_panel_title">Settings Panel</string>
 
-    <!-- Title for the Internet Connectivity dialog (settings panel) with Internet related settings [CHAR LIMIT=50] -->
-    <string name="internet_connectivity_panel_title">Internet Connectivity</string>
-
-    <!-- Title for the Volume dialog (settings panel) with all volume streams[CHAR LIMIT=50] -->
-    <string name="volume_connectivity_panel_title">Volume</string>
-
-    <!-- Subtitle explaining that mobile data cannot be used while airplane mode is on [CHAR LIMIT=50] -->
-    <string name="mobile_data_ap_mode_disabled">Unavailable during airplane mode</string>
-
     <!-- UI debug setting: force desktop mode [CHAR LIMIT=50] -->
     <string name="force_desktop_mode">Force desktop mode</string>
     <!-- UI debug setting: force desktop mode summary [CHAR LIMIT=NONE] -->
@@ -12373,10 +11411,6 @@
     <string name="contextual_card_dismiss_keep">Keep</string>
     <!-- String for contextual card dismissal [CHAR LIMIT=NONE] -->
     <string name="contextual_card_dismiss_confirm_message">Remove this suggestion?</string>
-    <!-- String for snack bar message when users swipe to dismiss a contextual card [CHAR LIMIT=60]-->
-    <string name="contextual_card_removed_message">Suggestion removed</string>
-    <!-- Label for snack bar action allowing users to undo contextual card dismissal [CHAR LIMIT=30]-->
-    <string name="contextual_card_undo_dismissal_text">Undo</string>
 
     <!-- Summary for low storage slice. [CHAR LIMIT=NONE] -->
     <string name="low_storage_summary">Storage is low. <xliff:g id="percentage" example="54%">%1$s</xliff:g> used - <xliff:g id="free_space" example="32GB">%2$s</xliff:g> free</string>
@@ -12392,15 +11426,6 @@
     <!-- String for talkback on the account avatar of the search bar.  [CHAR LIMIT=NONE] -->
     <string name="search_bar_account_avatar_content_description"></string>
 
-    <!-- Text to display when no app used permission.  [CHAR LIMIT=NONE] -->
-    <string name="permission_bar_chart_empty_text">0 apps used permissions</string>
-
-    <!-- Text for permission bar chart title in Privacy page.  [CHAR LIMIT=NONE] -->
-    <string name="permission_bar_chart_title">Permission usage in last 24 hours</string>
-
-    <!-- Text for permission bar chart details in Privacy page.  [CHAR LIMIT=NONE] -->
-    <string name="permission_bar_chart_details">See all in Dashboard</string>
-
     <!-- Title for the accessibility usage preference in the Privacy page.  [CHAR LIMIT=NONE] -->
     <string name="accessibility_usage_title">Accessibility usage</string>
 
@@ -12410,15 +11435,6 @@
         <item quantity="other"><xliff:g id="service_count">%1$d</xliff:g> apps have full access to your device</item>
     </plurals>
 
-    <!-- Title for the Switch output dialog (settings panel) with media related devices [CHAR LIMIT=50] -->
-    <string name="media_output_panel_title">Switch output</string>
-    <!-- Summary for represent which device is playing media [CHAR LIMIT=NONE] -->
-    <string name="media_output_panel_summary_of_playing_device">Currently playing on <xliff:g id="device_name" example="Bose headphone">%1$s</xliff:g></string>
-    <!-- Summary for disconnected status [CHAR LIMIT=50] -->
-    <string name="media_output_disconnected_status"><xliff:g id="device_name" example="My device">%1$s</xliff:g> (disconnected)</string>
-    <!-- Summary for switching error state [CHAR LIMIT=40] -->
-    <string name="media_output_switch_error_text">Can\u2019t switch. Tap to try again.</string>
-
     <!-- Label for the title on wfc disclaimer fragment. [CHAR LIMIT=40] -->
     <string name="wfc_disclaimer_title_text">Important information</string>
 
@@ -12596,9 +11612,6 @@
     <!-- Subtext for showing the option of RTT setting. [CHAR LIMIT=NONE] -->
     <string name="rtt_settings_always_visible"></string>
 
-    <!-- Button label to stop casting on media device. [CHAR LIMIT=40 -->
-    <string name="media_output_panel_stop_casting_button">Stop casting</string>
-
     <!-- Title for the 5G limited VoLTE dialog. [CHAR LIMIT=50] -->
     <string name="volte_5G_limited_title">Turn off VoLTE?</string>
     <!-- Content description for the 5G limited VoLTE dialog. [CHAR LIMIT=NONE] -->
@@ -12658,8 +11671,6 @@
     <string name="provider_internet_settings">Internet</string>
     <!-- Provider Model: SIMs controls settings screen, item title to go into the SIMs settings -->
     <string name="provider_network_settings_title">SIMs</string>
-    <!-- Provider Model: List of synonyms for the airplane-safe networks, used to match in settings search [CHAR LIMIT=NONE] -->
-    <string name="keywords_airplane_safe_networks">airplane, airplane-safe</string>
     <!-- Provider Model: Calls and SMS controllers settings screen, item title to go into the Calls and SMS settings -->
     <string name="calls_and_sms">Calls &amp; SMS</string>
     <!-- Provider Model: Name for call settings category [CHAR LIMIT=NONE] -->
@@ -12686,10 +11697,6 @@
     <string name="network_and_internet_preferences_title">Network preferences</string>
     <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
-    <!-- Slice title text for turning on the Wi-Fi networks. [CHAR LIMIT=40] -->
-    <string name="turn_on_wifi">Turn on Wi\u2011Fi</string>
-    <!-- Slice title text for turning off the Wi-Fi networks. [CHAR LIMIT=40] -->
-    <string name="turn_off_wifi">Turn off Wi\u2011Fi</string>
     <!-- Title for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
     <string name="reset_your_internet_title">Reset your internet?</string>
     <!-- Description for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
@@ -12704,10 +11711,6 @@
     <string name="networks_available">Networks available</string>
     <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
     <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
-    <!-- Panel subtitle for Wi-Fi turned off. [CHAR LIMIT=60] -->
-    <string name="wifi_is_off">Wi\u2011Fi is off</string>
-    <!-- Panel subtitle for tapping a network to connect to internet. [CHAR LIMIT=60] -->
-    <string name="tap_a_network_to_connect">Tap a network to connect</string>
     <!-- Title for merged carrier Wi-Fi offload toggle. [CHAR LIMIT=NONE] -->
     <string name="carrier_wifi_offload_title">W+ connections</string>
     <!-- Summary for merged carrier Wi-Fi offload toggle. [CHAR LIMIT=NONE] -->
@@ -12750,10 +11753,6 @@
     <!-- Provider Model:
          Summary indicating that a SIM has no mobile data connection [CHAR LIMIT=50] -->
     <string name="mobile_data_off_summary">Mobile data won\u0027t auto\u2011connect</string>
-    <!-- Provider Model: Summary indicating that no other networks available [CHAR LIMIT=50] -->
-    <string name="non_carrier_network_unavailable">No other networks available</string>
-    <!-- Provider Model: Summary indicating that no networks available [CHAR LIMIT=50] -->
-    <string name="all_network_unavailable">No networks available</string>
     <!-- Title of the dialog to turn off data usage [CHAR LIMIT=NONE] -->
     <string name="mobile_data_disable_title">Turn off mobile data?</string>
     <!-- Message body of the dialog to turn off data usage [CHAR LIMIT=NONE] -->
@@ -12795,8 +11794,6 @@
     <string name="category_name_color">Color</string>
     <!-- Name of Other display controls category in Display Settings [CHAR LIMIT=none] -->
     <string name="category_name_display_controls">Other display controls</string>
-    <!-- Others category name [CHAR LIMIT=none] -->
-    <string name="category_name_others">Others</string>
     <!-- General category name [CHAR LIMIT=none] -->
     <string name="category_name_general">General</string>
     <!-- Title for Dark theme main switch preferences. [CHAR LIMIT=50] -->
@@ -12820,18 +11817,10 @@
     <string name="wireless_debugging_main_switch_title">Use wireless debugging</string>
     <!-- Title for graphics driver main switch. [CHAR LIMIT=50] -->
     <string name="graphics_driver_main_switch_title">Use graphics driver preferences</string>
-    <!-- Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
-    <string name="battery_saver_main_switch_title">Use battery saver</string>
-    <!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
-    <string name="do_not_disturb_main_switch_title_on">Turn off now</string>
-    <!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
-    <string name="do_not_disturb_main_switch_title_off">Turn on now</string>
     <!-- Title for Night Light main switch preferences. [CHAR LIMIT=50] -->
     <string name="night_light_main_switch_title">Use Night Light</string>
     <!-- Title for NFC main switch preferences. [CHAR LIMIT=50] -->
     <string name="nfc_main_switch_title">Use NFC</string>
-    <!-- Title for Adaptive Battery main switch preferences. [CHAR LIMIT=50] -->
-    <string name="adaptive_battery_main_switch_title">Use adaptive battery</string>
     <!-- Title for adaptive brightness main switch preferences. [CHAR LIMIT=50] -->
     <string name="adaptive_brightness_main_switch_title">Use adaptive brightness</string>
     <!-- Title for wifi calling main switch preferences. [CHAR LIMIT=50] -->
@@ -12900,8 +11889,6 @@
     <string name="camera_toggle_title">Camera access</string>
     <!-- Label for the camera use toggle [CHAR LIMIT=40] -->
     <string name="mic_toggle_title">Microphone access</string>
-    <!-- Label for the location use toggle [CHAR LIMIT=40] -->
-    <string name="location_toggle_title">Location access</string>
     <!-- Describes what is affected by a permission toggle [CHAR LIMIT=NONE] -->
     <string name="perm_toggle_description">For apps and services</string>
     <!-- Describes what is affected by the mic toggle [CHAR LIMIT=NONE] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 133b0b34295..591d8007bca 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -63,11 +63,6 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="form_value">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">match_parent</item>
-    </style>
-
     <style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
         <item name="android:layout_marginStart">0dp</item>
         <item name="android:layout_marginEnd">0dp</item>
@@ -80,22 +75,6 @@
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
-    <style name="bt_item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginStart">16dip</item>
-        <item name="android:layout_marginEnd">16dip</item>
-        <item name="android:orientation">vertical</item>
-        <item name="android:gravity">start</item>
-    </style>
-
-    <style name="bt_item_edit_content">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
     <style name="wifi_item">
         <item name="android:layout_marginTop">8dip</item>
         <item name="android:layout_marginStart">8dip</item>
@@ -198,18 +177,6 @@
         <item name="android:activityOpenExitAnimation">@anim/confirm_credential_open_exit</item>
     </style>
 
-    <style name="SetupWizardButton.Negative" parent="@style/SudGlifButton.Secondary">
-        <!-- Negative margin to offset for padding of the button itself. We want the label to be
-             aligned with the text above it -->
-        <item name="android:layout_marginStart">-16dp</item>
-    </style>
-
-    <style name="SetupWizardButton.Positive" parent="@style/SudGlifButton.Primary"/>
-
-    <style name="AccentColorHighlightBorderlessButton">
-        <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
-    </style>
-
     <style name="vpn_label">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/res/xml/mobile_network_list.xml b/res/xml/mobile_network_list.xml
deleted file mode 100644
index 6008de7ac0d..00000000000
--- a/res/xml/mobile_network_list.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<!-- @deprecated This class will be removed in Android U, use {@link network_provider_sims_list.xml}
-     instead.-->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/network_settings_title">
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="add_more"
-        settings:isPreferenceVisible="false"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true"
-        settings:searchable="false"
-        android:title="@string/mobile_network_list_add_more"
-        android:icon="@drawable/ic_menu_add_activated_tint"
-        android:order="100" >
-        <intent android:action="android.telephony.euicc.action.PROVISION_EMBEDDED_SUBSCRIPTION">
-            <extra android:name="android.telephony.euicc.extra.FORCE_PROVISION"
-                   android:value="true"/>
-        </intent>
-    </com.android.settingslib.RestrictedPreference>
-
-</PreferenceScreen>
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
deleted file mode 100644
index 2162c96eb8a..00000000000
--- a/res/xml/network_and_internet.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<!-- @deprecated This class will be removed in Android U, use {@link network_provider_internet.xml}
-     instead.-->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="network_and_internet_screen"
-    android:title="@string/network_dashboard_title">
-
-    <PreferenceCategory
-        android:key="multi_network_header"
-        android:title="@string/summary_placeholder"
-        android:layout="@layout/preference_category_no_label"
-        settings:allowDividerBelow="true"
-        android:order="-40"
-        settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
-
-    <com.android.settingslib.PrimarySwitchPreference
-        android:fragment="com.android.settings.wifi.WifiSettings"
-        android:key="main_toggle_wifi"
-        android:title="@string/wifi_settings"
-        android:summary="@string/summary_placeholder"
-        android:icon="@drawable/ic_settings_wireless"
-        android:order="-30"
-        settings:allowDividerAbove="true">
-        <intent
-            android:action="android.settings.WIFI_SETTINGS"
-            android:targetClass="Settings$WifiSettingsActivity" />
-    </com.android.settingslib.PrimarySwitchPreference>
-
-    <com.android.settings.widget.AddPreference
-        android:key="mobile_network_list"
-        android:title="@string/network_settings_title"
-        android:summary="@string/summary_placeholder"
-        android:icon="@drawable/ic_network_cell"
-        android:order="-15"
-        settings:keywords="@string/keywords_more_mobile_networks"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="airplane_mode"
-        android:title="@string/airplane_mode"
-        android:icon="@drawable/ic_airplanemode_active"
-        android:disableDependentsState="true"
-        android:order="-5"
-        settings:controller="com.android.settings.network.AirplaneModePreferenceController"
-        settings:userRestriction="no_airplane_mode"/>
-
-    <com.android.settingslib.RestrictedPreference
-        android:key="manage_mobile_plan"
-        android:title="@string/manage_mobile_plan_title"
-        android:persistent="false"
-        android:order="19"
-        settings:userRestriction="no_config_mobile_networks"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.TetherSettings"
-        android:key="tether_settings"
-        android:title="@string/tether_settings_title_all"
-        android:icon="@drawable/ic_wifi_tethering"
-        android:order="5"
-        android:summary="@string/summary_placeholder"
-        settings:keywords="@string/keywords_hotspot_tethering"
-        settings:userRestriction="no_config_tethering"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settingslib.PrimarySwitchPreference
-        android:fragment="com.android.settings.AllInOneTetherSettings"
-        android:key="all_tether_settings"
-        android:title="@string/tether_settings_title_all"
-        android:icon="@drawable/ic_wifi_tethering"
-        android:order="6"
-        android:summary="@string/summary_placeholder"
-        settings:controller="com.android.settings.network.AllInOneTetherPreferenceController"
-        settings:keywords="@string/keywords_hotspot_tethering"
-        settings:userRestriction="no_config_tethering"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settings.datausage.DataSaverPreference
-        android:key="restrict_background_parent_entry"
-        android:title="@string/data_saver_title"
-        android:icon="@drawable/ic_settings_data_usage"
-        android:order="10"
-        android:fragment="com.android.settings.datausage.DataSaverSummary"/>
-
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.vpn2.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title"
-        android:icon="@drawable/ic_vpn_key"
-        android:order="15"
-        android:summary="@string/summary_placeholder"
-        settings:userRestriction="no_config_vpn"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settings.network.PrivateDnsModeDialogPreference
-        android:key="private_dns_settings"
-        android:title="@string/select_private_dns_configuration_title"
-        android:order="20"
-        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
-        android:dialogLayout="@layout/private_dns_mode_dialog"
-        android:positiveButtonText="@string/save"
-        android:negativeButtonText="@android:string/cancel" />
-
-    <Preference
-        android:fragment="com.android.settings.network.AdaptiveConnectivitySettings"
-        android:key="adaptive_connectivity"
-        android:title="@string/adaptive_connectivity_title"
-        android:summary="@string/summary_placeholder"
-        android:order="25"
-        settings:controller="com.android.settings.network.AdaptiveConnectivityPreferenceController"/>
-</PreferenceScreen>
diff --git a/res/xml/network_scorer_picker_prefs.xml b/res/xml/network_scorer_picker_prefs.xml
deleted file mode 100644
index fab69e76f87..00000000000
--- a/res/xml/network_scorer_picker_prefs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 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.
-  -->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/network_scorer_picker_title">
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/notification_group_settings.xml b/res/xml/notification_group_settings.xml
deleted file mode 100644
index e714759aed3..00000000000
--- a/res/xml/notification_group_settings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto">
-
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="pref_app_header"
-        android:layout="@layout/settings_entity_header" />
-
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="block" />
-
-    <!-- Channels added here -->
-
-    <Preference
-        android:key="app_link"
-        android:title="@string/app_settings_link"
-        settings:allowDividerAbove="true"/>
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="desc" />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="block_desc" />
-</PreferenceScreen>
diff --git a/res/xml/notification_importance.xml b/res/xml/notification_importance.xml
deleted file mode 100644
index 9dc2ee2a51d..00000000000
--- a/res/xml/notification_importance.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/notification_importance_title">
-
-        <com.android.settingslib.widget.SelectorWithWidgetPreference
-            android:key="importance_high"
-            android:title="@string/notification_importance_high" />
-        <com.android.settingslib.widget.SelectorWithWidgetPreference
-            android:key="importance_default"
-            android:title="@string/notification_importance_default" />
-        <com.android.settingslib.widget.SelectorWithWidgetPreference
-            android:key="importance_low"
-            android:title="@string/notification_importance_low" />
-        <com.android.settingslib.widget.SelectorWithWidgetPreference
-            android:key="importance_min"
-            android:title="@string/notification_importance_min" />
-
-</PreferenceScreen>
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
deleted file mode 100644
index 144bef614d9..00000000000
--- a/res/xml/notification_settings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/app_notifications_title">
-
-</PreferenceScreen>
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
deleted file mode 100644
index 056551f4e29..00000000000
--- a/res/xml/other_sound_settings.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/other_sound_settings"
-        android:key="other_sound_settings"
-        xmlns:settings="http://schemas.android.com/apk/res-auto">
-
-    <!-- Dial pad tones -->
-    <SwitchPreference
-            android:key="dial_pad_tones"
-            android:title="@string/dial_pad_tones_title" />
-
-    <!-- Screen locking sounds -->
-    <SwitchPreference
-            android:key="screen_locking_sounds"
-            android:title="@string/screen_locking_sounds_title" />
-
-    <!-- Charging sounds -->
-    <SwitchPreference
-            android:key="charging_sounds"
-            android:title="@string/charging_sounds_title" />
-
-    <!-- Docking sounds -->
-    <SwitchPreference
-            android:key="docking_sounds"
-            android:title="@string/docking_sounds_title" />
-
-    <!-- Touch sounds -->
-    <SwitchPreference
-            android:key="touch_sounds"
-            android:title="@string/touch_sounds_title" />
-
-    <!-- Vibrate icon in status bar -->
-    <SwitchPreference
-            android:key="vibrate_icon"
-            android:title="@string/vibrate_icon_title" />
-
-    <!-- Dock speaker plays -->
-    <DropDownPreference
-            android:key="dock_audio_media"
-            android:title="@string/dock_audio_media_title"
-            android:summary="%s" />
-
-    <!-- Boot sounds -->
-    <SwitchPreference
-            android:key="boot_sounds"
-            android:title="@string/boot_sounds_title" />
-
-    <!-- Emergency tone -->
-    <DropDownPreference
-            android:key="emergency_tone"
-            android:title="@string/emergency_tone_title"
-            android:summary="%s" />
-
-</PreferenceScreen>
diff --git a/res/xml/profile_challenge_settings.xml b/res/xml/profile_challenge_settings.xml
deleted file mode 100644
index e3ad0c3f1e8..00000000000
--- a/res/xml/profile_challenge_settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/lock_settings_profile_title">
-
-</PreferenceScreen>
diff --git a/res/xml/sync_settings.xml b/res/xml/sync_settings.xml
deleted file mode 100644
index 530f4ab25cb..00000000000
--- a/res/xml/sync_settings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
-        android:key="sync_switch"
-        android:title="@string/sync_automatically" />
-</PreferenceScreen>
diff --git a/res/xml/usage_access_settings.xml b/res/xml/usage_access_settings.xml
deleted file mode 100644
index 4cd4a9822eb..00000000000
--- a/res/xml/usage_access_settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="usage_access_screen"
-    android:title="@string/usage_access_title"/>
diff --git a/res/xml/vibrate_for_calls_settings.xml b/res/xml/vibrate_for_calls_settings.xml
deleted file mode 100644
index 5b6d217a1f2..00000000000
--- a/res/xml/vibrate_for_calls_settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2020 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.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/vibrate_when_ringing_title" />
diff --git a/res/xml/voice_input_settings.xml b/res/xml/voice_input_settings.xml
deleted file mode 100644
index 47d72ecc7e9..00000000000
--- a/res/xml/voice_input_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/voice_input_settings_title">
-
-    <!-- The contents of this category are filled in by the Java code
-         based on the list of available voice interaction and recognition services. -->
-    <PreferenceCategory android:key="voice_service_preference_section"
-        android:title="@string/voice_service_preference_section_title" />
-
-</PreferenceScreen>
diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml
deleted file mode 100644
index 7b8c92b1e6b..00000000000
--- a/res/xml/wifi_access_points.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/wifi_settings_category">
-
-    <com.android.settings.bluetooth.BluetoothProgressCategory
-            android:key="access_points"
-            android:title="@string/wifi_access_points"
-            android:persistent="false" />
-
-    <Preference
-            android:key="add_network"
-            android:title="@string/wifi_add_network"
-            android:persistent="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/wifi_access_points_for_wifi_setup_xl.xml b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
deleted file mode 100644
index 14266f50c88..00000000000
--- a/res/xml/wifi_access_points_for_wifi_setup_xl.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-</PreferenceScreen>
diff --git a/src/com/android/settings/UsageStatsActivity.java b/src/com/android/settings/UsageStatsActivity.java
deleted file mode 100755
index d9803ddfb93..00000000000
--- a/src/com/android/settings/UsageStatsActivity.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * 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.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.app.usage.UsageStats;
-import android.app.usage.UsageStatsManager;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.text.format.DateUtils;
-import android.util.ArrayMap;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Activity to display package usage statistics.
- */
-public class UsageStatsActivity extends Activity implements OnItemSelectedListener {
-    private static final String TAG = "UsageStatsActivity";
-    private static final boolean localLOGV = false;
-    private UsageStatsManager mUsageStatsManager;
-    private LayoutInflater mInflater;
-    private UsageStatsAdapter mAdapter;
-    private PackageManager mPm;
-
-    public static class AppNameComparator implements Comparator<UsageStats> {
-        private Map<String, String> mAppLabelList;
-
-        AppNameComparator(Map<String, String> appList) {
-            mAppLabelList = appList;
-        }
-
-        @Override
-        public final int compare(UsageStats a, UsageStats b) {
-            String alabel = mAppLabelList.get(a.getPackageName());
-            String blabel = mAppLabelList.get(b.getPackageName());
-            return alabel.compareTo(blabel);
-        }
-    }
-
-    public static class LastTimeUsedComparator implements Comparator<UsageStats> {
-        @Override
-        public final int compare(UsageStats a, UsageStats b) {
-            // return by descending order
-            return Long.compare(b.getLastTimeUsed(), a.getLastTimeUsed());
-        }
-    }
-
-    public static class UsageTimeComparator implements Comparator<UsageStats> {
-        @Override
-        public final int compare(UsageStats a, UsageStats b) {
-            return Long.compare(b.getTotalTimeInForeground(), a.getTotalTimeInForeground());
-        }
-    }
-
-    // View Holder used when displaying views
-    static class AppViewHolder {
-        TextView pkgName;
-        TextView lastTimeUsed;
-        TextView usageTime;
-    }
-
-    class UsageStatsAdapter extends BaseAdapter {
-         // Constants defining order for display order
-        private static final int _DISPLAY_ORDER_USAGE_TIME = 0;
-        private static final int _DISPLAY_ORDER_LAST_TIME_USED = 1;
-        private static final int _DISPLAY_ORDER_APP_NAME = 2;
-
-        private int mDisplayOrder = _DISPLAY_ORDER_USAGE_TIME;
-        private LastTimeUsedComparator mLastTimeUsedComparator = new LastTimeUsedComparator();
-        private UsageTimeComparator mUsageTimeComparator = new UsageTimeComparator();
-        private AppNameComparator mAppLabelComparator;
-        private final ArrayMap<String, String> mAppLabelMap = new ArrayMap<>();
-        private final ArrayList<UsageStats> mPackageStats = new ArrayList<>();
-
-        UsageStatsAdapter() {
-            Calendar cal = Calendar.getInstance();
-            cal.add(Calendar.DAY_OF_YEAR, -5);
-
-            final List<UsageStats> stats =
-                    mUsageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST,
-                            cal.getTimeInMillis(), System.currentTimeMillis());
-            if (stats == null) {
-                return;
-            }
-
-            ArrayMap<String, UsageStats> map = new ArrayMap<>();
-            final int statCount = stats.size();
-            for (int i = 0; i < statCount; i++) {
-                final android.app.usage.UsageStats pkgStats = stats.get(i);
-
-                // load application labels for each application
-                try {
-                    ApplicationInfo appInfo = mPm.getApplicationInfo(pkgStats.getPackageName(), 0);
-                    String label = appInfo.loadLabel(mPm).toString();
-                    mAppLabelMap.put(pkgStats.getPackageName(), label);
-
-                    UsageStats existingStats =
-                            map.get(pkgStats.getPackageName());
-                    if (existingStats == null) {
-                        map.put(pkgStats.getPackageName(), pkgStats);
-                    } else {
-                        existingStats.add(pkgStats);
-                    }
-
-                } catch (NameNotFoundException e) {
-                    // This package may be gone.
-                }
-            }
-            mPackageStats.addAll(map.values());
-
-            // Sort list
-            mAppLabelComparator = new AppNameComparator(mAppLabelMap);
-            sortList();
-        }
-
-        @Override
-        public int getCount() {
-            return mPackageStats.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mPackageStats.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            // A ViewHolder keeps references to children views to avoid unneccessary calls
-            // to findViewById() on each row.
-            AppViewHolder holder;
-
-            // When convertView is not null, we can reuse it directly, there is no need
-            // to reinflate it. We only inflate a new View when the convertView supplied
-            // by ListView is null.
-            if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.usage_stats_item, null);
-
-                // Creates a ViewHolder and store references to the two children views
-                // we want to bind data to.
-                holder = new AppViewHolder();
-                holder.pkgName = (TextView) convertView.findViewById(R.id.package_name);
-                holder.lastTimeUsed = (TextView) convertView.findViewById(R.id.last_time_used);
-                holder.usageTime = (TextView) convertView.findViewById(R.id.usage_time);
-                convertView.setTag(holder);
-            } else {
-                // Get the ViewHolder back to get fast access to the TextView
-                // and the ImageView.
-                holder = (AppViewHolder) convertView.getTag();
-            }
-
-            // Bind the data efficiently with the holder
-            UsageStats pkgStats = mPackageStats.get(position);
-            if (pkgStats != null) {
-                String label = mAppLabelMap.get(pkgStats.getPackageName());
-                holder.pkgName.setText(label);
-                holder.lastTimeUsed.setText(DateUtils.formatSameDayTime(pkgStats.getLastTimeUsed(),
-                        System.currentTimeMillis(), DateFormat.MEDIUM, DateFormat.MEDIUM));
-                holder.usageTime.setText(
-                        DateUtils.formatElapsedTime(pkgStats.getTotalTimeInForeground() / 1000));
-            } else {
-                Log.w(TAG, "No usage stats info for package:" + position);
-            }
-            return convertView;
-        }
-
-        void sortList(int sortOrder) {
-            if (mDisplayOrder == sortOrder) {
-                // do nothing
-                return;
-            }
-            mDisplayOrder= sortOrder;
-            sortList();
-        }
-        private void sortList() {
-            if (mDisplayOrder == _DISPLAY_ORDER_USAGE_TIME) {
-                if (localLOGV) Log.i(TAG, "Sorting by usage time");
-                Collections.sort(mPackageStats, mUsageTimeComparator);
-            } else if (mDisplayOrder == _DISPLAY_ORDER_LAST_TIME_USED) {
-                if (localLOGV) Log.i(TAG, "Sorting by last time used");
-                Collections.sort(mPackageStats, mLastTimeUsedComparator);
-            } else if (mDisplayOrder == _DISPLAY_ORDER_APP_NAME) {
-                if (localLOGV) Log.i(TAG, "Sorting by application name");
-                Collections.sort(mPackageStats, mAppLabelComparator);
-            }
-            notifyDataSetChanged();
-        }
-    }
-
-    /** Called when the activity is first created. */
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.usage_stats);
-
-        mUsageStatsManager = (UsageStatsManager) getSystemService(Context.USAGE_STATS_SERVICE);
-        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mPm = getPackageManager();
-
-        Spinner typeSpinner = (Spinner) findViewById(R.id.typeSpinner);
-        typeSpinner.setOnItemSelectedListener(this);
-
-        ListView listView = (ListView) findViewById(R.id.pkg_list);
-        mAdapter = new UsageStatsAdapter();
-        listView.setAdapter(mAdapter);
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        mAdapter.sortList(position);
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-        // do nothing
-    }
-}
diff --git a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
index d8a887d510e..e78982a94d9 100644
--- a/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityStatsLogUtils.java
@@ -28,6 +28,7 @@ import static com.android.settings.accessibility.TextReadingPreferenceFragment.R
 
 import android.content.ComponentName;
 
+import com.android.internal.util.FrameworkStatsLog;
 import com.android.settings.core.instrumentation.SettingsStatsLog;
 
 /** Methods for logging accessibility states. */
@@ -112,4 +113,26 @@ public final class AccessibilityStatsLogUtils {
                 return SettingsStatsLog.ACCESSIBILITY_TEXT_READING_OPTIONS_CHANGED__ENTRY_POINT__TEXT_READING_UNKNOWN_ENTRY;
         }
     }
+
+    /**
+     * Converts the entering page id where the hearing aid binding process starts for logging.
+     *
+     * @param pageId the entry page id where the hearing aid binding process starts
+     * @return the int value for logging mapped from some page ids defined in
+     * {@link SettingsStatsLog}
+     */
+    public static int convertToHearingAidInfoBondEntry(int pageId) {
+        switch (pageId) {
+            case SettingsStatsLog.SETTINGS_UICHANGED__PAGE_ID__SETTINGS_CONNECTED_DEVICE_CATEGORY:
+                return FrameworkStatsLog.HEARING_AID_INFO_REPORTED__BOND_ENTRY__CONNECTED_DEVICES;
+            case SettingsStatsLog.SETTINGS_UICHANGED__PAGE_ID__DIALOG_ACCESSIBILITY_HEARINGAID:
+                return FrameworkStatsLog.HEARING_AID_INFO_REPORTED__BOND_ENTRY__ACCESSIBILITY_HEARING_AIDS;
+            case SettingsStatsLog.SETTINGS_UICHANGED__PAGE_ID__DIALOG_ACCESSIBILITY_HEARING_AID_PAIR_ANOTHER:
+                return FrameworkStatsLog.HEARING_AID_INFO_REPORTED__BOND_ENTRY__ACCESSIBILITY_HEARING_AID_PAIR_ANOTHER;
+            case SettingsStatsLog.SETTINGS_UICHANGED__PAGE_ID__BLUETOOTH_FRAGMENT:
+                return FrameworkStatsLog.HEARING_AID_INFO_REPORTED__BOND_ENTRY__BLUETOOTH;
+            default:
+                return FrameworkStatsLog.HEARING_AID_INFO_REPORTED__BOND_ENTRY__PAGE_UNKNOWN;
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 2e0e9b5c2ff..9a92783e18a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -29,8 +29,11 @@ import android.widget.Toast;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
+import com.android.settings.accessibility.AccessibilityStatsLogUtils;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HearingAidStatsLogUtils;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.widget.FooterPreference;
 
@@ -179,6 +182,13 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
             // If one device is connected(bonded), then close this fragment.
             finish();
             return;
+        } else if (bondState == BluetoothDevice.BOND_BONDING) {
+            // Set the bond entry where binding process starts for logging hearing aid device info
+            final int pageId = FeatureFactory.getFactory(
+                    getContext()).getMetricsFeatureProvider().getAttribution(getActivity());
+            final int bondEntry = AccessibilityStatsLogUtils.convertToHearingAidInfoBondEntry(
+                    pageId);
+            HearingAidStatsLogUtils.setBondEntryForDevice(bondEntry, cachedDevice);
         }
         if (mSelectedDevice != null && cachedDevice != null) {
             BluetoothDevice device = cachedDevice.getDevice();
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index e39e41aaab5..e47ecbdc997 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -27,6 +27,8 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.utils.ThreadUtils;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 
 public class DataSaverBackend {
@@ -43,10 +45,11 @@ public class DataSaverBackend {
     private boolean mDenylistInitialized;
 
     // TODO: Staticize into only one.
-    public DataSaverBackend(Context context) {
-        mContext = context;
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-        mPolicyManager = NetworkPolicyManager.from(context);
+    public DataSaverBackend(@NotNull Context context) {
+        // TODO(b/246537614):Use fragment context to DataSaverBackend class will caused memory leak
+        mContext = context.getApplicationContext();
+        mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+        mPolicyManager = NetworkPolicyManager.from(mContext);
     }
 
     public void addListener(Listener listener) {
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
index 027e8c806ca..c188e2b25bd 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
@@ -74,6 +74,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
         for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
                 simSlotNumber++) {
             final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setCopyingEnabled(true);
             multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
             multiSimPreference.setKey(getPreferenceKey() + simSlotNumber);
             category.addPreference(multiSimPreference);
@@ -150,7 +151,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
 
     private int getPhoneType(int slotIndex) {
         SubscriptionInfo subInfo = SubscriptionManager.from(mContext)
-            .getActiveSubscriptionInfoForSimSlotIndex(slotIndex);
+                .getActiveSubscriptionInfoForSimSlotIndex(slotIndex);
         return mTelephonyManager.getCurrentPhoneType(subInfo != null ? subInfo.getSubscriptionId()
                 : SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
     }
diff --git a/src/com/android/settings/nearby/FastPairSettingsFragment.java b/src/com/android/settings/nearby/FastPairSettingsFragment.java
index a92833a3db7..2fff7a0dee0 100644
--- a/src/com/android/settings/nearby/FastPairSettingsFragment.java
+++ b/src/com/android/settings/nearby/FastPairSettingsFragment.java
@@ -21,6 +21,7 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.nearby.NearbyManager;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -34,6 +35,7 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 import java.util.Objects;
 
@@ -48,14 +50,17 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
     private static final String SCAN_SWITCH_KEY = "fast_pair_scan_switch";
     private static final String SAVED_DEVICES_PREF_KEY = "saved_devices";
 
+    private MainSwitchPreference mMainSwitchPreference;
+    private OnMainSwitchChangeListener mMainSwitchChangeListener;
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        MainSwitchPreference mainSwitchPreference = Objects.requireNonNull(
+        mMainSwitchPreference = Objects.requireNonNull(
                 findPreference(SCAN_SWITCH_KEY));
-        mainSwitchPreference.setChecked(false);
-
+        mMainSwitchChangeListener = (switchView, isChecked) ->
+                NearbyManager.setFastPairScanEnabled(getContext(), isChecked);
         Preference savedDevicePref = Objects.requireNonNull(
                 findPreference(SAVED_DEVICES_PREF_KEY));
         savedDevicePref.setOnPreferenceClickListener(preference -> {
@@ -67,6 +72,19 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        mMainSwitchPreference.addOnSwitchChangeListener(mMainSwitchChangeListener);
+        mMainSwitchPreference.setChecked(NearbyManager.isFastPairScanEnabled(getContext()));
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mMainSwitchPreference.removeOnSwitchChangeListener(mMainSwitchChangeListener);
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.CONNECTION_DEVICE_ADVANCED_FAST_PAIR;
diff --git a/src/com/android/settings/network/MultiNetworkHeaderController.java b/src/com/android/settings/network/MultiNetworkHeaderController.java
deleted file mode 100644
index 2be4d62ebd5..00000000000
--- a/src/com/android/settings/network/MultiNetworkHeaderController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2018 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.
- */
-
-package com.android.settings.network;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiConnectionPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-/**
- * This controls a header at the top of the Network & internet page that only appears when there
- * are two or more active mobile subscriptions. It shows an overview of available network
- * connections with an entry for wifi (if connected) and an entry for each subscription.
- *
- * @deprecated This class will be removed in Android U, there is no networks header anymore.
- */
-@Deprecated
-public class MultiNetworkHeaderController extends BasePreferenceController implements
-        WifiConnectionPreferenceController.UpdateListener,
-        SubscriptionsPreferenceController.UpdateListener {
-    public static final String TAG = "MultiNetworkHdrCtrl";
-
-    private WifiConnectionPreferenceController mWifiController;
-    private SubscriptionsPreferenceController mSubscriptionsController;
-    private PreferenceCategory mPreferenceCategory;
-    private PreferenceScreen mPreferenceScreen;
-    private int mOriginalExpandedChildrenCount;
-
-    public MultiNetworkHeaderController(Context context, String key) {
-        super(context, key);
-    }
-
-    public void init(Lifecycle lifecycle) {
-        mWifiController = createWifiController(lifecycle);
-        mSubscriptionsController = createSubscriptionsController(lifecycle);
-    }
-
-    @VisibleForTesting
-    WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) {
-        final int prefOrder = 0;
-        return new WifiConnectionPreferenceController(mContext, lifecycle, this, mPreferenceKey,
-                prefOrder, SettingsEnums.SETTINGS_NETWORK_CATEGORY);
-    }
-
-    @VisibleForTesting
-    SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
-        final int prefStartOrder = 10;
-        return new SubscriptionsPreferenceController(mContext, lifecycle, this, mPreferenceKey,
-                prefStartOrder);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreferenceScreen = screen;
-        mOriginalExpandedChildrenCount = mPreferenceScreen.getInitialExpandedChildrenCount();
-        mPreferenceCategory = screen.findPreference(mPreferenceKey);
-        mPreferenceCategory.setVisible(isAvailable());
-        mWifiController.displayPreference(screen);
-        mSubscriptionsController.displayPreference(screen);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        if (mSubscriptionsController == null || !mSubscriptionsController.isAvailable()) {
-            return CONDITIONALLY_UNAVAILABLE;
-        } else {
-            return AVAILABLE;
-        }
-    }
-
-    @Override
-    public void onChildrenUpdated() {
-        final boolean available = isAvailable();
-        // TODO(b/129893781) we need a better way to express where the advanced collapsing starts
-        // for preference groups that have items dynamically added/removed in the top expanded
-        // section.
-        if (mOriginalExpandedChildrenCount != Integer.MAX_VALUE) {
-            if (available) {
-                mPreferenceScreen.setInitialExpandedChildrenCount(
-                        mOriginalExpandedChildrenCount + mPreferenceCategory.getPreferenceCount());
-            } else {
-                mPreferenceScreen.setInitialExpandedChildrenCount(mOriginalExpandedChildrenCount);
-            }
-        }
-        mPreferenceCategory.setVisible(available);
-    }
-}
diff --git a/src/com/android/settings/network/NetworkMobileProviderController.java b/src/com/android/settings/network/NetworkMobileProviderController.java
index 33123b30c7f..e0db395caf4 100644
--- a/src/com/android/settings/network/NetworkMobileProviderController.java
+++ b/src/com/android/settings/network/NetworkMobileProviderController.java
@@ -32,10 +32,9 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
  * are active mobile subscriptions. It shows an overview of available mobile network
  * connections with an entry for each subscription.
  *
- *  {@link NetworkMobileProviderController} is used to show subscription status on internet
- *  page for provider model. This original class can refer to {@link MultiNetworkHeaderController},
- *
-  */
+ * {@link NetworkMobileProviderController} is used to show subscription status on internet
+ * page for provider model.
+ */
 public class NetworkMobileProviderController extends BasePreferenceController implements
         SubscriptionsPreferenceController.UpdateListener {
 
diff --git a/src/com/android/settings/spa/SpaActivity.kt b/src/com/android/settings/spa/SpaActivity.kt
index fab0e081f65..f161c441fd6 100644
--- a/src/com/android/settings/spa/SpaActivity.kt
+++ b/src/com/android/settings/spa/SpaActivity.kt
@@ -23,9 +23,9 @@ import com.android.settingslib.spa.framework.BrowseActivity
 class SpaActivity : BrowseActivity(SpaEnvironment.settingsPageProviders) {
     companion object {
         @JvmStatic
-        fun startSpaActivity(context: Context, startDestination: String) {
+        fun startSpaActivity(context: Context, destination: String) {
             val intent = Intent(context, SpaActivity::class.java).apply {
-                putExtra(KEY_DESTINATION, startDestination)
+                putExtra(KEY_DESTINATION, destination)
             }
             context.startActivity(intent)
         }
diff --git a/src/com/android/settings/spa/SpaBridgeActivity.kt b/src/com/android/settings/spa/SpaBridgeActivity.kt
new file mode 100755
index 00000000000..9e433e449ca
--- /dev/null
+++ b/src/com/android/settings/spa/SpaBridgeActivity.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package com.android.settings.spa
+
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.ComponentInfoFlags
+import android.os.Bundle
+import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
+
+/**
+ * Activity used as a bridge to [SpaActivity].
+ *
+ * Since [SpaActivity] is not exported, [SpaActivity] could not be the target activity of
+ * <activity-alias>, otherwise all its pages will be exported.
+ * So need this bridge activity to sit in the middle of <activity-alias> and [SpaActivity].
+ */
+class SpaBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        getDestination()?.let { destination ->
+            startSpaActivity(this, destination)
+        }
+        finish()
+    }
+
+    private fun getDestination(): String? =
+        packageManager.getActivityInfo(
+            componentName, ComponentInfoFlags.of(PackageManager.GET_META_DATA.toLong())
+        ).metaData.getString(META_DATA_KEY_DESTINATION)
+
+    companion object {
+        private const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
+    }
+}
diff --git a/src/com/android/settings/spa/SpaDebugActivity.kt b/src/com/android/settings/spa/SpaDebugActivity.kt
new file mode 100644
index 00000000000..40fe1d5822b
--- /dev/null
+++ b/src/com/android/settings/spa/SpaDebugActivity.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package com.android.settings.spa
+
+import com.android.settingslib.spa.framework.DebugActivity
+
+class SpaDebugActivity :
+    DebugActivity(SpaEnvironment.settingsEntryRepository, SpaActivity::class.java)
diff --git a/src/com/android/settings/spa/SpaEnvironment.kt b/src/com/android/settings/spa/SpaEnvironment.kt
index 8c88a03cd7e..ad9999ae9c9 100644
--- a/src/com/android/settings/spa/SpaEnvironment.kt
+++ b/src/com/android/settings/spa/SpaEnvironment.kt
@@ -24,11 +24,12 @@ import com.android.settings.spa.app.specialaccess.MediaManagementAppsAppListProv
 import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider
 import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider
 import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
+import com.android.settings.spa.development.UsageStatsPageProvider
 import com.android.settings.spa.home.HomePageProvider
-import com.android.settingslib.spa.framework.common.SettingsEntryRepository
-import com.android.settingslib.spa.framework.common.SettingsPage
 import com.android.settings.spa.notification.AppListNotificationsPageProvider
 import com.android.settings.spa.notification.NotificationMainPageProvider
+import com.android.settingslib.spa.framework.common.SettingsEntryRepository
+import com.android.settingslib.spa.framework.common.SettingsPage
 import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository
 import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate
 
@@ -52,6 +53,7 @@ object SpaEnvironment {
                 SpecialAppAccessPageProvider,
                 NotificationMainPageProvider,
                 AppListNotificationsPageProvider,
+                UsageStatsPageProvider,
             ) + togglePermissionAppListTemplate.createPageProviders(),
             rootPages = listOf(
                 SettingsPage.create(HomePageProvider.name),
diff --git a/src/com/android/settings/spa/development/UsageStats.kt b/src/com/android/settings/spa/development/UsageStats.kt
new file mode 100644
index 00000000000..302f2010b31
--- /dev/null
+++ b/src/com/android/settings/spa/development/UsageStats.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package com.android.settings.spa.development
+
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.compose.navigator
+import com.android.settingslib.spa.framework.compose.rememberContext
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spaprivileged.template.app.AppListItem
+import com.android.settingslib.spaprivileged.template.app.AppListPage
+
+object UsageStatsPageProvider : SettingsPageProvider {
+    override val name = "UsageStats"
+
+    @Composable
+    override fun Page(arguments: Bundle?) {
+        AppListPage(
+            title = stringResource(R.string.testing_usage_stats),
+            listModel = rememberContext(::UsageStatsListModel),
+            primaryUserOnly = true,
+        ) { itemModel ->
+            AppListItem(itemModel) {}
+        }
+    }
+
+    @Composable
+    fun EntryItem() {
+        Preference(object : PreferenceModel {
+            override val title = stringResource(R.string.testing_usage_stats)
+            override val onClick = navigator(name)
+        })
+    }
+}
diff --git a/src/com/android/settings/spa/development/UsageStatsListModel.kt b/src/com/android/settings/spa/development/UsageStatsListModel.kt
new file mode 100644
index 00000000000..caa30cc2535
--- /dev/null
+++ b/src/com/android/settings/spa/development/UsageStatsListModel.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package com.android.settings.spa.development
+
+import android.app.usage.UsageStats
+import android.app.usage.UsageStatsManager
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.text.format.DateUtils
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import com.android.settings.R
+import com.android.settings.spa.development.UsageStatsListModel.SpinnerItem.Companion.toSpinnerItem
+import com.android.settingslib.spa.framework.compose.stateOf
+import com.android.settingslib.spaprivileged.model.app.AppEntry
+import com.android.settingslib.spaprivileged.model.app.AppListModel
+import com.android.settingslib.spaprivileged.model.app.AppRecord
+import java.text.DateFormat
+import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+
+data class UsageStatsAppRecord(
+    override val app: ApplicationInfo,
+    val usageStats: UsageStats?,
+) : AppRecord
+
+class UsageStatsListModel(private val context: Context) : AppListModel<UsageStatsAppRecord> {
+    private val usageStatsManager =
+        context.getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+    private val now = System.currentTimeMillis()
+
+    override fun transform(
+        userIdFlow: Flow<Int>,
+        appListFlow: Flow<List<ApplicationInfo>>,
+    ) = userIdFlow.map { getUsageStats() }
+        .combine(appListFlow) { usageStatsMap, appList ->
+            appList.map { app -> UsageStatsAppRecord(app, usageStatsMap[app.packageName]) }
+        }
+
+    override fun getSpinnerOptions() = SpinnerItem.values().map {
+        context.getString(it.stringResId)
+    }
+
+    override fun filter(
+        userIdFlow: Flow<Int>,
+        option: Int,
+        recordListFlow: Flow<List<UsageStatsAppRecord>>,
+    ) = recordListFlow.map { recordList ->
+        recordList.filter { it.usageStats != null }
+    }
+
+    override fun getComparator(option: Int) = when (option.toSpinnerItem()) {
+        SpinnerItem.UsageTime -> compareByDescending { it.record.usageStats?.totalTimeInForeground }
+        SpinnerItem.LastTimeUsed -> compareByDescending { it.record.usageStats?.lastTimeUsed }
+        else -> compareBy<AppEntry<UsageStatsAppRecord>> { 0 }
+    }.then(super.getComparator(option))
+
+    @Composable
+    override fun getSummary(option: Int, record: UsageStatsAppRecord): State<String>? {
+        val usageStats = record.usageStats ?: return null
+        val lastTimeUsed = DateUtils.formatSameDayTime(
+            usageStats.lastTimeUsed, now, DateFormat.MEDIUM, DateFormat.MEDIUM)
+        val lastTimeUsedLine = "${context.getString(R.string.last_time_used_label)}: $lastTimeUsed"
+        val usageTime = DateUtils.formatElapsedTime(usageStats.totalTimeInForeground / 1000)
+        val usageTimeLine = "${context.getString(R.string.usage_time_label)}: $usageTime"
+        return stateOf("$lastTimeUsedLine\n$usageTimeLine")
+    }
+
+    private fun getUsageStats(): Map<String, UsageStats> {
+        val startTime = now - TimeUnit.DAYS.toMillis(5)
+
+        return usageStatsManager.queryUsageStats(UsageStatsManager.INTERVAL_BEST, startTime, now)
+            .groupingBy { it.packageName }.reduce { _, a, b -> a.add(b); a }
+    }
+
+    private enum class SpinnerItem(val stringResId: Int) {
+        UsageTime(R.string.usage_stats_sort_by_usage_time),
+        LastTimeUsed(R.string.usage_stats_sort_by_last_time_used),
+        AppName(R.string.usage_stats_sort_by_app_name);
+
+        companion object {
+            fun Int.toSpinnerItem(): SpinnerItem = values()[this]
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 73ff31d4e47..c0ac159aebf 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -56,8 +56,9 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
     WifiTetherSoftApManager mWifiTetherSoftApManager;
 
     public WifiTetherPreferenceController(Context context, Lifecycle lifecycle) {
+        // TODO(b/246537032):Use fragment context to WifiManager service will caused memory leak
         this(context, lifecycle,
-                context.getSystemService(WifiManager.class),
+                context.getApplicationContext().getSystemService(WifiManager.class),
                 context.getSystemService(TetheringManager.class),
                 true /* initSoftApManager */,
                 WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(context));
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java b/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java
index 2db037fdd0a..f2bacc8db9e 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSoftApManager.java
@@ -5,6 +5,7 @@ import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.HandlerExecutor;
 
+import java.lang.ref.WeakReference;
 import java.util.List;
 
 /**
@@ -15,23 +16,14 @@ public class WifiTetherSoftApManager {
     private WifiManager mWifiManager;
     private WifiTetherSoftApCallback mWifiTetherSoftApCallback;
 
-    private WifiManager.SoftApCallback mSoftApCallback = new WifiManager.SoftApCallback() {
-        @Override
-        public void onStateChanged(int state, int failureReason) {
-            mWifiTetherSoftApCallback.onStateChanged(state, failureReason);
-        }
-
-        @Override
-        public void onConnectedClientsChanged(List<WifiClient> clients) {
-            mWifiTetherSoftApCallback.onConnectedClientsChanged(clients);
-        }
-    };
+    private WifiManager.SoftApCallback mSoftApCallback;
     private Handler mHandler;
 
     WifiTetherSoftApManager(WifiManager wifiManager,
             WifiTetherSoftApCallback wifiTetherSoftApCallback) {
         mWifiManager = wifiManager;
         mWifiTetherSoftApCallback = wifiTetherSoftApCallback;
+        mSoftApCallback = new WifiManagerSoftApCallback(this);
         mHandler = new Handler();
     }
 
@@ -43,6 +35,14 @@ public class WifiTetherSoftApManager {
         mWifiManager.unregisterSoftApCallback(mSoftApCallback);
     }
 
+    void onStateChanged(int state, int failureReason) {
+        mWifiTetherSoftApCallback.onStateChanged(state, failureReason);
+    }
+
+    void onConnectedClientsChanged(List<WifiClient> clients) {
+        mWifiTetherSoftApCallback.onConnectedClientsChanged(clients);
+    }
+
     public interface WifiTetherSoftApCallback {
         void onStateChanged(int state, int failureReason);
 
@@ -53,4 +53,31 @@ public class WifiTetherSoftApManager {
          */
         void onConnectedClientsChanged(List<WifiClient> clients);
     }
+
+    // TODO(b/246537032):Need to declare the service callback as static class and use
+    //  WeakReference to avoid the callback link being occupied by WifiManager
+    private static final class WifiManagerSoftApCallback implements
+            WifiManager.SoftApCallback {
+        WeakReference<WifiTetherSoftApManager> mMyClass;
+
+        WifiManagerSoftApCallback(WifiTetherSoftApManager controller) {
+            mMyClass = new WeakReference<>(controller);
+        }
+
+        @Override
+        public void onStateChanged(int state, int failureReason) {
+            WifiTetherSoftApManager controller = mMyClass.get();
+            if (controller == null) return;
+
+            controller.onStateChanged(state, failureReason);
+        }
+
+        @Override
+        public void onConnectedClientsChanged(List<WifiClient> clients) {
+            WifiTetherSoftApManager controller = mMyClass.get();
+            if (controller == null) return;
+
+            controller.onConnectedClientsChanged(clients);
+        }
+    }
 }
diff --git a/tests/robotests/res/drawable/selectable_card.xml b/tests/robotests/res/drawable/selectable_card.xml
deleted file mode 100644
index 8d1274a86ca..00000000000
--- a/tests/robotests/res/drawable/selectable_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2017 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.
--->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <!-- Overlay this since Robolectric has trouble inflating ?android:attr/colorBackground -->
-    <item android:drawable="@android:color/transparent"/>
-</ripple>
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
deleted file mode 100644
index c51bb18f376..00000000000
--- a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2020 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.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.Looper;
-import android.telephony.SubscriptionManager;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.wifi.WifiConnectionPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class MultiNetworkHeaderControllerTest {
-    private static final String KEY_HEADER = "multi_network_header";
-    private static final int EXPANDED_CHILDREN_COUNT = 5;
-
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-    @Mock
-    private WifiConnectionPreferenceController mWifiController;
-    @Mock
-    private SubscriptionsPreferenceController mSubscriptionsController;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private Lifecycle mLifecycle;
-
-    private Context mContext;
-    private PreferenceManager mPreferenceManager;
-    private PreferenceScreen mPreferenceScreen;
-    private MultiNetworkHeaderController mHeaderController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-
-        mHeaderController = new MultiNetworkHeaderController(mContext, KEY_HEADER) {
-            @Override
-            WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) {
-                return mWifiController;
-            }
-
-            @Override
-            SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
-                return mSubscriptionsController;
-            }
-        };
-
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-        mPreferenceManager = new PreferenceManager(mContext);
-        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
-        mPreferenceScreen.setInitialExpandedChildrenCount(EXPANDED_CHILDREN_COUNT);
-        when(mPreferenceCategory.getKey()).thenReturn(KEY_HEADER);
-        when(mPreferenceCategory.getPreferenceCount()).thenReturn(3);
-        mPreferenceScreen.addPreference(mPreferenceCategory);
-    }
-
-    @Test
-    public void isAvailable_beforeInitIsCalled_notAvailable() {
-        assertThat(mHeaderController.isAvailable()).isFalse();
-    }
-
-    // When calling displayPreference, the header itself should only be visible if the
-    // subscriptions controller says it is available. This is a helper for test cases of this logic.
-    private void displayPreferenceTest(boolean wifiAvailable, boolean subscriptionsAvailable,
-            boolean setVisibleExpectedValue) {
-        when(mWifiController.isAvailable()).thenReturn(wifiAvailable);
-        when(mSubscriptionsController.isAvailable()).thenReturn(subscriptionsAvailable);
-
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-        Assert.assertEquals(mPreferenceCategory.isVisible(), setVisibleExpectedValue);
-    }
-
-    @Test
-    public void displayPreference_bothNotAvailable_categoryIsNotVisible() {
-        displayPreferenceTest(false, false, false);
-    }
-
-    @Test
-    public void displayPreference_wifiAvailableButNotSubscriptions_categoryIsNotVisible() {
-        displayPreferenceTest(true, false, false);
-    }
-
-    @Test
-    public void displayPreference_subscriptionsAvailableButNotWifi_categoryIsVisible() {
-        displayPreferenceTest(false, true, true);
-    }
-
-    @Test
-    public void displayPreference_bothAvailable_categoryIsVisible() {
-        displayPreferenceTest(true, true, true);
-    }
-
-    @Test
-    public void onChildUpdated_subscriptionsBecameAvailable_categoryIsVisible() {
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.onChildrenUpdated();
-
-        Assert.assertTrue(mPreferenceCategory.isVisible());
-        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
-                EXPANDED_CHILDREN_COUNT + mPreferenceCategory.getPreferenceCount());
-    }
-
-    @Test
-    public void onChildUpdated_subscriptionsBecameUnavailable_categoryIsNotVisible() {
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.onChildrenUpdated();
-
-        Assert.assertFalse(mPreferenceCategory.isVisible());
-        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
-                EXPANDED_CHILDREN_COUNT);
-    }
-
-    @Test
-    public void onChildUpdated_noExpandedChildCountAndAvailable_doesNotSetExpandedCount() {
-        mPreferenceScreen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.onChildrenUpdated();
-
-        // Check that setInitialExpandedChildrenCount was never called.
-        Assert.assertEquals(mPreferenceScreen.getInitialExpandedChildrenCount(), Integer.MAX_VALUE);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java
index b626bff27f6..ac62a09ef59 100644
--- a/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java
@@ -49,8 +49,7 @@ import org.mockito.MockitoAnnotations;
  * Unit test for NetworkMobileProviderController.
  *
  * {@link NetworkMobileProviderController} is used to show subscription status on internet page for
- * provider model. This original class can refer to {@link MultiNetworkHeaderController}, and
- * NetworkMobileProviderControllerTest can also refer to {@link MultiNetworkHeaderControllerTest}.
+ * provider model.
  */
 @RunWith(AndroidJUnit4.class)
 public class NetworkMobileProviderControllerTest {