diff --git a/Android.bp b/Android.bp
index 47244771a25..93ae0628b45 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,7 @@ android_library {
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",
+        "src/**/*.aidl",
     ],
     exclude_srcs: [
         "src/com/android/settings/biometrics/fingerprint2/lib/**/*.kt",
@@ -98,8 +99,10 @@ android_library {
         "WindowManager-Shell-shared-desktopMode",
 
         // Settings dependencies
+        "google_battery",
         "FingerprintManagerInteractor",
         "MediaDrmSettingsFlagsLib",
+        "ReverseWirelessCharging",
         "Settings-change-ids",
         "SettingsLib",
         "SettingsLibActivityEmbedding",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 585c2125164..d3513a93ba3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,6 +150,7 @@
     <uses-permission android:name="android.permission.SATELLITE_COMMUNICATION" />
     <uses-permission android:name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER" />
     <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
+    <uses-permission android:name="app.grapheneos.logviewer.SHOW_LOGCAT" />
 
     <application
             android:name=".SettingsApplication"
@@ -519,6 +520,19 @@
                 android:value="true" />
         </activity>
 
+        <!-- this is supposed to be used both for wifi and mobile data, controlled by flags -->
+        <activity
+            android:name=".network.InternetSetupActivity"
+            android:theme="@style/GlifV4Theme.DayNight"
+            android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.SETUP_INTERNET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <activity
             android:name=".wifi.WifiPickerActivity"
             android:permission="android.permission.CHANGE_WIFI_STATE"
@@ -634,6 +648,7 @@
         </activity>
 
         <activity android:name=".wifi.WifiConfigInfo"
+            android:theme="@style/Theme.DeviceDefault.DayNight.NoEdgeToEdge"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -656,6 +671,7 @@
         </activity>
 
         <activity android:name=".wifi.WifiStatusTest"
+            android:theme="@style/Theme.DeviceDefault.DayNight.NoEdgeToEdge"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -2407,6 +2423,23 @@
                        android:value="@string/menu_key_safety_center"/>
         </activity>
 
+        <activity
+            android:name=".Settings$ExploitProtectionActivity"
+            android:label="@string/exploit_protection_settings"
+            android:permission="android.permission.MANAGE_SAFETY_CENTER"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="com.android.settings.EXPLOIT_PROTECTION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.safetycenter.ExploitProtectionFragment" />
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                       android:value="@string/menu_key_safety_center"/>
+        </activity>
+
         <activity android:name="MonitoringCertInfoActivity"
                 android:label=""
                 android:theme="@style/Transparent"
@@ -3301,6 +3334,26 @@
             <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </activity>
 
+        <activity android:name=".security.DuressPasswordMainActivity"
+            android:excludeFromRecents="true"
+            android:theme="@style/GlifTheme.Light"
+            android:permission="android.permission.MANAGE_SAFETY_CENTER"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="com.android.settings.DURESS_PASSWORD_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                       android:value="@string/menu_key_safety_center"/>
+        </activity>
+
+        <activity android:name=".security.DuressPasswordSetupActivity"
+            android:excludeFromRecents="true"
+            android:theme="@style/GlifTheme.Light"
+            android:exported="false" />
+
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
             android:exported="true"
             android:icon="@drawable/ic_suggestion_fingerprint">
@@ -3346,6 +3399,12 @@
             android:enableOnBackInvokedCallback="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name=".password.ChooseBiometricSecondFactorPin"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light"
+            android:enableOnBackInvokedCallback="false"
+            android:windowSoftInputMode="stateVisible|adjustResize"/>
+
         <activity
             android:name=".Settings$StorageDashboardActivity"
             android:label="@string/storage_settings"
@@ -3513,6 +3572,7 @@
         </activity>
 
         <activity android:name=".development.AppPicker"
+                  android:theme="@style/Theme.DeviceDefault.DayNight.NoEdgeToEdge"
                   android:label="@string/select_application" />
 
         <activity android:name=".development.AdbQrCodeActivity" />
@@ -5770,6 +5830,12 @@
                 android:value="@string/menu_key_apps"/>
         </activity-alias>
 
+        <provider
+            android:name="com.android.settings.sudconfig.SudConfigProvider"
+            android:authorities="com.google.android.setupwizard.partner"
+            android:directBootAware="true"
+            android:exported="true" />
+
         <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
         <provider
             android:name="androidx.startup.InitializationProvider"
@@ -6023,5 +6089,107 @@
 
         <!-- This is the longest AndroidManifest.xml ever. -->
 
+
+        <activity
+            android:name="Settings$AppNativeDebuggingActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_NATIVE_DEBUGGING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppNativeDebuggingFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name="Settings$AppMemtagActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_MEMTAG_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppMemtagFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name="Settings$AppHardenedMallocActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_HARDENED_MALLOC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppHardenedMallocFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name=".Settings$AppMemoryDynCodeLoadingActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_MEMORY_DYN_CODE_LOADING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppMemoryDynCodeLoadingFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name=".Settings$AppStorageDynCodeLoadingActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_STORAGE_DYN_CODE_LOADING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppStorageDynCodeLoadingFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name=".Settings$AppManagePlayIntegrityApiActivity"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_MANAGE_PLAY_INTEGRITY_API_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppManagePlayIntegrityApiFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
     </application>
 </manifest>
diff --git a/TODO-16-qpr1 b/TODO-16-qpr1
new file mode 100644
index 00000000000..42e2ca661d5
--- /dev/null
+++ b/TODO-16-qpr1
@@ -0,0 +1,6 @@
+Skipped commits:
+"set distinct UI name for override_desktop_mode_features toggle": not clear if needed
+
+Potential issues:
+Wi-Fi randomization
+"don't send device name" in Wi-Fi settings
diff --git a/res/drawable/baseline_wifi.xml b/res/drawable/baseline_wifi.xml
new file mode 100644
index 00000000000..e8b85e7ced0
--- /dev/null
+++ b/res/drawable/baseline_wifi.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z" />
+</vector>
diff --git a/res/drawable/baseline_wifi_glif.xml b/res/drawable/baseline_wifi_glif.xml
new file mode 100644
index 00000000000..3f12842b089
--- /dev/null
+++ b/res/drawable/baseline_wifi_glif.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="?attr/sudGlifIconSize"
+        android:height="?attr/sudGlifIconSize"
+        android:drawable="@drawable/baseline_wifi" />
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_battery_charging_full_google.xml b/res/drawable/ic_battery_charging_full_google.xml
new file mode 100644
index 00000000000..31240e14482
--- /dev/null
+++ b/res/drawable/ic_battery_charging_full_google.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/settingslib_materialColorOnSurface"
+        android:pathData="M660,880L660,760L560,760L700,560L700,680L800,680L660,880ZM360,800L360,800L360,800L360,800Q360,800 360,800Q360,800 360,800Q360,800 360,800Q360,800 360,800ZM320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,480Q659,480 639,483.5Q619,487 600,494L600,240L360,240L360,800L454,800Q462,823 473.5,843Q485,863 501,880L320,880Z"/>
+</vector>
diff --git a/res/drawable/ic_high_emission_frequency.xml b/res/drawable/ic_high_emission_frequency.xml
new file mode 100644
index 00000000000..adb60134094
--- /dev/null
+++ b/res/drawable/ic_high_emission_frequency.xml
@@ -0,0 +1,35 @@
+<!--
+     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.
+-->
+
+<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="960"
+            android:viewportHeight="960">
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z"/>
+        </vector>
+    </item>
+</layer-list>
diff --git a/res/drawable/ic_settings_install.xml b/res/drawable/ic_settings_install.xml
index 5bd5e300eae..eefecc242a4 100644
--- a/res/drawable/ic_settings_install.xml
+++ b/res/drawable/ic_settings_install.xml
@@ -18,7 +18,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="#FF000000"
       android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18z"/>
diff --git a/res/layout/choose_biometric_second_factor_pin.xml b/res/layout/choose_biometric_second_factor_pin.xml
new file mode 100644
index 00000000000..c2eb13ae537
--- /dev/null
+++ b/res/layout/choose_biometric_second_factor_pin.xml
@@ -0,0 +1,90 @@
+<?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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+    android:importantForAutofill="noExcludeDescendants">
+
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/sud_layout_description"
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minLines="2"/>
+
+        <LinearLayout
+            android:id="@+id/password_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:layoutMode="opticalBounds"
+            android:paddingBottom="8dp">
+
+            <!-- Password entry field -->
+            <com.android.settings.widget.ScrollToParentEditText
+                android:id="@+id/password_entry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
+                style="@style/TextAppearance.PasswordEntry"/>
+
+            <CheckBox
+                android:id="@+id/auto_pin_confirm_enabler"
+                android:layout_marginTop="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/auto_pin_confirm_user_message"
+                android:textSize="16sp"
+                android:button="@drawable/checkbox_circle_shape"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/auto_pin_confirm_security_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:gravity="center"
+            android:text="@string/auto_pin_confirm_opt_in_security_message"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/duress_password_setup.xml b/res/layout/duress_password_setup.xml
new file mode 100644
index 00000000000..a708b3fc3e5
--- /dev/null
+++ b/res/layout/duress_password_setup.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/glif_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_lock"
+>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        style="@style/SudContentFrame">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:text="@string/unlock_set_unlock_pin_title" />
+
+        <EditText
+            android:id="@+id/pin_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:hint="@string/duress_pwd_enter_pin"
+            android:imeOptions="actionNext"
+            android:inputType="numberPassword" />
+
+        <EditText
+            android:id="@+id/pin_input_confirmation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:hint="@string/duress_pwd_confirm_pin"
+            android:imeOptions="actionNext"
+            android:inputType="numberPassword" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:text="@string/unlock_set_unlock_password_title" />
+
+        <EditText
+            android:id="@+id/password_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:hint="@string/duress_pwd_enter_password"
+            android:imeOptions="actionNext"
+            android:inputType="textPassword" />
+
+        <EditText
+            android:id="@+id/password_input_confirmation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:hint="@string/duress_pwd_confirm_password"
+            android:imeOptions="actionDone"
+            android:inputType="textPassword" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index 48352e2efa0..5111332bfbe 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -34,40 +34,38 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <RelativeLayout android:id="@+id/button_bar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_weight="0"
-                    android:visibility="gone">
-
-        <Button android:id="@+id/back_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:layout_alignParentStart="true"
-                android:text="@*android:string/back_button_label"/>
-
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true">
-
-            <Button android:id="@+id/skip_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dip"
-                    android:text="@*android:string/skip_button_label"
-                    android:visibility="gone"/>
+    <!-- button bar is used only by activities that use setupdesign-->
+    <RelativeLayout
+        android:id="@+id/button_bar"
+        style="@style/SudGlifButtonBar.Stackable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
 
-            <Button android:id="@+id/next_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dip"
-                    android:text="@*android:string/next_button_label"/>
+        <Button
+            android:id="@+id/back_button"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="@dimen/sud_glif_button_margin_end"
+            android:text="@*android:string/back_button_label" />
 
-        </LinearLayout>
+        <Button
+            android:id="@+id/skip_button"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/back_button"
+            android:text="@*android:string/skip_button_label"
+            android:visibility="gone" />
 
+        <Button
+            android:id="@+id/next_button"
+            style="@style/SudGlifButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:text="@*android:string/next_button_label" />
     </RelativeLayout>
-
 </LinearLayout>
diff --git a/res/layout/wifi_network_config.xml b/res/layout/wifi_network_config.xml
index 990f7599ac9..a76e203cb24 100644
--- a/res/layout/wifi_network_config.xml
+++ b/res/layout/wifi_network_config.xml
@@ -789,7 +789,7 @@
                 android:id="@+id/privacy_settings"
                 style="@style/wifi_item_spinner"
                 android:prompt="@string/wifi_privacy_settings"
-                android:entries="@array/wifi_privacy_entries"/>
+                android:entries="@array/wifi_privacy_entries_ext"/>
 
             <Spinner
                 android:id="@+id/dhcp_settings"
diff --git a/res/values-night-v31/fractions.xml b/res/values-night-v31/fractions.xml
new file mode 100644
index 00000000000..547f63d5515
--- /dev/null
+++ b/res/values-night-v31/fractions.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <fraction name="setup_compat_footer_button_ripple_alpha">24%</fraction>
+</resources>
diff --git a/res/values-night/bools.xml b/res/values-night/bools.xml
new file mode 100644
index 00000000000..bfdd9cf0334
--- /dev/null
+++ b/res/values-night/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="setup_compat_light_navigation_bar">false</bool>
+    <bool name="setup_compat_light_status_bar">false</bool>
+</resources>
diff --git a/res/values-sw600dp-v31/dimens.xml b/res/values-sw600dp-v31/dimens.xml
new file mode 100644
index 00000000000..3542f62dc08
--- /dev/null
+++ b/res/values-sw600dp-v31/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+    <!-- Fixes redundant horizontal margin issue on tablets -->
+    <dimen name="sud_glif_margin_start_material_you">24dp</dimen>
+    <dimen name="sud_glif_margin_end_material_you">24dp</dimen>
+    <dimen name="sud_glif_footer_bar_padding_start_material_you">8dp</dimen>
+    <dimen name="sud_glif_footer_bar_padding_end_material_you">20dp</dimen>
+    <dimen name="sud_glif_button_margin_end">20dp</dimen>
+    <dimen name="sud_glif_button_margin_start">8dp</dimen>
+</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index f5615bfbe67..255df2876d9 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -29,6 +29,14 @@
     <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->
     <dimen name="biometric_auth_pattern_view_size">348dp</dimen>
 
+    <!-- Fixes redundant horizontal margin issue on tablets -->
+    <dimen name="sud_glif_margin_start_material_you">24dp</dimen>
+    <dimen name="sud_glif_margin_end_material_you">24dp</dimen>
+    <dimen name="sud_glif_footer_bar_padding_start_material_you">8dp</dimen>
+    <dimen name="sud_glif_footer_bar_padding_end_material_you">20dp</dimen>
+    <dimen name="sud_glif_button_margin_end">20dp</dimen>
+    <dimen name="sud_glif_button_margin_start">8dp</dimen>
+
     <!--  Pointer fill color preference  -->
     <dimen name="pointer_fill_container_height">104dp</dimen>
     <dimen name="pointer_fill_container_max_width">448dp</dimen>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f0fe2b5c236..412c235912a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1112,8 +1112,9 @@
         <item>Treat as unmetered</item>
     </string-array>
 
-    <string-array name="wifi_privacy_entries">
-        <item>Use randomized MAC</item>
+    <string-array name="wifi_privacy_entries_ext">
+        <item>Use per-connection randomized MAC (default)</item>
+        <item>Use per-network randomized MAC</item>
         <item>Use device MAC</item>
     </string-array>
 
@@ -1133,7 +1134,8 @@
         <item>2</item>
     </string-array>
 
-    <string-array name="wifi_privacy_values" translatable="false">
+    <string-array name="wifi_privacy_values_ext" translatable="false">
+        <item>100</item>
         <item>1</item>
         <item>0</item>
     </string-array>
@@ -1655,6 +1657,8 @@
     <!-- Packages that will not show Display over other apps permission -->
     <string-array name="display_over_apps_permission_change_exempt">
     </string-array>
+    <string-array name="fingerprint_acquired_vendor" />
+
 
     <!-- Titles for Action Corner customization option. [CHAR LIMIT=35] -->
     <string-array name="action_corner_action_titles">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c5cb82de15f..589d7a3d303 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -66,6 +66,8 @@
         <attr name="searchable" format="boolean" />
         <!-- Classname of a PreferenceController corresponding to the preference -->
         <attr name="controller" format="string" />
+        <!-- Reference to a BoolSetting. Format: className <space> fieldName -->
+        <attr name="boolSettingField" format="string" />
         <!-- Customized subtitle if it's an unavailable slice -->
         <attr name="unavailableSliceSubtitle" format="string" />
         <!-- Whether or not the preference is for work profile, by default it's false. -->
diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 00000000000..d978b71d643
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="setup_compat_light_navigation_bar">true</bool>
+    <bool name="setup_compat_light_status_bar">true</bool>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d00bfe4ed10..b73d32b05ae 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -266,6 +266,11 @@
     <color name="screen_flash_preset_opacity_color_11">#4DFF00FE</color> <!-- 30% Magenta -->
     <color name="screen_flash_preset_opacity_color_12">#667F00FF</color> <!-- 40% Violet -->
 
+    <!-- Setup wizard related -->
+    <color name="setup_compat_footer_primary_button_bg_color">
+        @color/sud_color_accent_glif_v3_light
+    </color>
+
     <!-- Switch bar disabled state color-->
     <color name="switch_bar_state_disabled_color">#1F1F1F1F</color>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index 76a9050bdd0..28d7036e7a3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -524,7 +524,7 @@
     <bool name="config_disable_uninstall_update">false</bool>
 
     <!-- Slice Uri to query nearby devices. -->
-    <string name="config_nearby_devices_slice_uri" translatable="false">content://com.google.android.gms.nearby.fastpair/device_status_list_item</string>
+    <string name="config_nearby_devices_slice_uri" translatable="false"></string>
 
     <!-- BT Slice intent action. To support Settings 2 panel, BT slice can't use PendingIntent.send(). Therefore, here defines the Slice intent action. -->
     <string name="config_bt_slice_intent_action" translatable="false"></string>
@@ -618,7 +618,7 @@
     <string name="config_other_storage_category_uri" translatable="false">content://com.android.providers.media.documents/root/others_root</string>
 
     <!-- Whether to show Smart Storage toggle -->
-    <bool name="config_show_smart_storage_toggle">true</bool>
+    <bool name="config_show_smart_storage_toggle">false</bool>
 
     <!-- Display settings screen, Color mode options. Must be the same length and order as
          config_color_mode_options_values below. Only the values that also appear in
diff --git a/res/values/config_google.xml b/res/values/config_google.xml
new file mode 100644
index 00000000000..075926c5209
--- /dev/null
+++ b/res/values/config_google.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_show_touch_sensitivity">false</bool>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b4575a9d168..77c51537c2b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -283,6 +283,9 @@
     <!-- Choose lock Password requirement dimensions -->
     <dimen name="password_requirement_view_margin_top">16dp</dimen>
 
+    <!-- Margin above biometric second factor PIN requirements -->
+    <dimen name="biometric_second_factor_pin_requirement_view_margin_top">44dp</dimen>
+
     <!-- Screen lock option button dimensions -->
     <dimen name="screen_lock_options_button_margin_top">32dp</dimen>
 
@@ -523,6 +526,16 @@
     <dimen name="audio_streams_qrcode_scanner_fragment_padding">16dp</dimen>
     <dimen name="audio_sharing_name_preference_edit_text_format_alert_padding">24dp</dimen>
 
+    <!-- Setup wizard related -->
+    <dimen name="sud_progress_bar_margin_top">
+        @dimen/sud_progress_bar_margin_top_material_you
+    </dimen>
+    <dimen name="setup_design_card_view_intrinsic_height">0dp</dimen>
+    <dimen name="setup_design_card_view_intrinsic_width">0dp</dimen>
+    <dimen name="setup_compat_footer_button_radius">
+        @dimen/sud_footer_bar_button_radius_material_you
+    </dimen>
+
     <!-- Zen Modes -->
     <dimen name="zen_mode_header_size">136dp</dimen>
     <dimen name="zen_mode_header_inner_icon_size">64dp</dimen>
diff --git a/res/values/fractions.xml b/res/values/fractions.xml
new file mode 100644
index 00000000000..78454226886
--- /dev/null
+++ b/res/values/fractions.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <fraction name="setup_compat_footer_button_ripple_alpha">12%</fraction>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea5dbdff62b..222a96bf0b6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1078,6 +1078,38 @@
     <string name="setup_fingerprint_enroll_skip_after_adding_lock_text">Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings.</string>
     <!-- Title of dialog shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so [CHAR LIMIT=30]-->
 
+    <!-- Header on first screen of choose biometric second factor PIN flow [CHAR LIMIT=40] -->
+    <string name="biometric_second_factor_pin_choose_header">Set a second factor PIN</string>
+    <!-- Header on biometric second factor PIN confirm screen [CHAR LIMIT=40] -->
+    <string name="biometric_second_factor_confirm_header">Re-enter your second factor PIN</string>
+    <!-- Description of biometric second factor PIN -->
+    <string name="biometric_second_factor_pin_description">This PIN will be required in addition to your fingerprint when attempting to enter the device from the lockscreen.</string>
+    <string name="biometric_second_factor_pin_description_empty"></string>
+    <!-- Toast for a failed biometric second factor PIN change attempt [CHAR LIMIT=120]-->
+    <string name="biometric_second_factor_pin_change_failed">Unable to change second factor PIN!</string>
+
+    <!--  Title of biometric second factor PIN settings page -->
+    <string name="biometric_second_factor_pin_settings_title">Second factor PIN</string>
+    <!--  Title of biometric second factor PIN settings page -->
+    <string name="biometric_second_factor_pin_settings_category_title">Settings</string>
+    <!-- Title of preference within biometric second factor PIN settings to change the PIN -->
+    <string name="biometric_second_factor_pin_change_title">Change PIN</string>
+    <!-- Title of preference within biometric second factor PIN settings to delete the PIN -->
+    <string name="biometric_second_factor_pin_delete_title">Delete PIN</string>
+    <!-- Title of the confirmation dialog displayed to the user when they attempt to delete biometric second factor PIN -->
+    <string name="biometric_second_factor_pin_delete_confirmation_dialog_title">Delete second factor PIN?</string>
+    <!-- Message of the confirmation dialog displayed to the user when they attempt to delete biometric second factor PIN -->
+    <string name="biometric_second_factor_pin_delete_confirmation_dialog_message">It is recommended to always have a second factor PIN when biometric unlock is enabled. Deleting this will make your device less secure.</string>
+    <!-- Positive button of the confirmation dialog displayed to the user when they attempt to delete biometric second factor PIN -->
+    <string name="biometric_second_factor_pin_delete_confirmation_dialog_positive_button">Delete</string>
+
+    <!-- Title of preference within fingerprint settings for biometric second factor PIN -->
+    <string name="biometric_second_factor_pin_title">Second factor PIN</string>
+    <!-- Summary of preference within fingerprint settings for biometric second factor PIN when setup is needed -->
+    <string name="biometric_second_factor_pin_setup_summary">Setup needed</string>
+    <!-- Summary of preference within fingerprint settings for biometric second factor PIN when it has been setup -->
+    <string name="biometric_second_factor_pin_empty_summary"></string>
+
     <!-- Introduction detail message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup">When you see this icon, use your fingerprint for authentication, like when you sign in to apps or approve a purchase</string>
     <!-- Introduction subtitle message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
@@ -3292,6 +3324,10 @@
     <string name="auto_rotate_summary_no_permission">Camera access is required for Face Detection. Tap to manage permissions for Device Personalization Services</string>
     <!-- auto_rotate settings screen, text for the camera permission button [CHAR LIMIT=NONE]-->
     <string name="auto_rotate_manage_permission_button">Manage permissions</string>
+    <!-- Display settings screen, increased touch sensitivity settings title [CHAR LIMIT=30] -->
+    <string name="touch_sensitivity_title">Increase touch sensitivity</string>
+    <!-- Display settings screen, increased touch sensitivity settings summary [CHAR LIMIT=NONE] -->
+    <string name="touch_sensitivity_summary">Improves touch when using screen protectors</string>
 
     <!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
     <string name="night_display_title">Night Light</string>
@@ -3624,6 +3660,8 @@
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="baseband_version">Baseband version</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+    <string name="bootloader_version">Bootloader version</string>
+    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="kernel_version">Kernel version</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="build_number">Build number</string>
@@ -4716,6 +4754,7 @@
     <string name="enable_text">Enable</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for example, remove all cached emails for an Email app) -->
     <string name="clear_user_data_text">Clear storage</string>
+    <string name="manage_storage_text">Manage storage</string>
     <!-- Manage applications, restore updated system application to factory version -->
     <string name="app_factory_reset">Uninstall updates</string>
     <!-- [CHAR LIMIT=50] Manage applications, unlock restricted setting from lock screen title -->
@@ -7870,6 +7909,8 @@
     <!-- Preference title for the toggle that controls whether to force all network connections to
         go through VPN. [CHAR LIMIT=40] -->
     <string name="vpn_require_connection">Block connections without VPN</string>
+    <!-- Setting subtext specifying Private DNS VPN leaks [CHAR LIMIT=NONE] -->
+    <string name="vpn_require_connection_summary">Note that there are known VPN leaks for secondary profiles if Private DNS is enabled</string>
     <!-- Dialog message title to confirm forcing all network connections to go through VPN.
         [CHAR LIMIT=40] -->
     <string name="vpn_require_connection_title">Require VPN connection?</string>
@@ -12884,6 +12925,8 @@
     <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
     <!-- LTE [CHAR LIMIT=NONE] -->
     <string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
+    <!-- LTE only [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_only_summary">Preferred network mode: LTE only</string>
     <!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] -->
     <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
     <!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->
@@ -12949,8 +12992,18 @@
     <string name="network_4G_pure" translatable="false">4G</string>
     <!-- Text for Network lte [CHAR LIMIT=NONE] -->
     <string name="network_lte">LTE (recommended)</string>
+    <!-- Text for Network lte only [CHAR LIMIT=NONE] -->
+    <string name="network_lte_only">LTE only</string>
+    <!-- Text for Network 5G only [CHAR LIMIT=NONE] -->
+    <string name="network_5g_only">5G only</string>
+    <!-- Text for Network 5G or LTE only [CHAR LIMIT=NONE] -->
+    <string name="network_5g_or_lte_only">5G or LTE only</string>
+    <!-- Text for Network 5G or 4G only [CHAR LIMIT=NONE] -->
+    <string name="network_5g_or_4g_only">5G or 4G only</string>
     <!-- Text for Network 4g [CHAR LIMIT=NONE] -->
     <string name="network_4G">4G (recommended)</string>
+    <!-- Text for Network 4g only [CHAR LIMIT=NONE] -->
+    <string name="network_4G_only">4G only</string>
     <!-- Text for Network 3g [CHAR LIMIT=NONE] -->
     <string name="network_3G" translatable="false">3G</string>
     <!-- Text for Network 2g [CHAR LIMIT=NONE] -->
diff --git a/res/values/strings_app_exploit_protection.xml b/res/values/strings_app_exploit_protection.xml
new file mode 100644
index 00000000000..33292064c8e
--- /dev/null
+++ b/res/values/strings_app_exploit_protection.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="exploit_protection_category_title">Exploit protection</string>
+
+    <string name="aep_allowed">Allowed</string>
+    <string name="aep_blocked">Blocked</string>
+    <string name="aep_default">Default (%1$s)</string>
+    <string name="aep_disabled">Disabled</string>
+    <string name="aep_enabled">Enabled</string>
+    <string name="aep_restricted">Restricted</string>
+
+    <string name="aep_confirm_disable_title">Warning</string>
+    <string name="aep_confirm_disable_warning_msg">This setting will weaken exploit protections for the selected app.</string>
+    <string name="aep_confirm_disable_proceed_btn">Proceed</string>
+
+    <string name="aep_dvr_default_security_setting">Default value can be changed in the %1$s section</string>
+
+    <string name="aep_dvr_compat_config_hardening_opt_in">The selected app is known to be compatible with this setting</string>
+    <string name="aep_dvr_compat_config_hardening_opt_out">%1$s by default, because this app is known to need it.
+This behavior can be disabled in the %2$s section.</string>
+
+    <string name="aep_dvr_app_is_client_of_gmscore">%1$s by default because this app depends on Play services</string>
+
+    <string name="aep_default_main_switch_block_for_3p_apps">Block for third-party apps by default</string>
+    <string name="aep_default_main_switch_restrict_for_3p_apps">Restrict for third-party apps by default</string>
+    <string name="aep_default_main_switch_disable_for_3p_apps">Disable for third-party apps by default</string>
+    <string name="aep_default_summary_restricted">Restricted by default</string>
+    <string name="aep_default_summary_restricted_except_for_gmscore_clients">Restricted by default, except for apps that depend on Play services</string>
+    <string name="aep_default_summary_disabled">Disabled by default</string>
+    <string name="aep_default_summary_blocked">Blocked by default</string>
+    <string name="aep_default_summary_allowed_for_3p_apps">Allowed for third-party apps by default</string>
+    <string name="aep_default_summary_enabled_for_3p_apps">Enabled for third-party apps by default</string>
+
+    <string name="aep_ir_exploit_protection_compat_mode">%1$s is enabled</string>
+
+    <string name="aep_compat_mode_title">Exploit protection compatibility mode</string>
+    <string name="aep_compat_mode_summary">Improves compatibility by disabling some of the GrapheneOS exploit protections for this app</string>
+
+    <string name="aep_hmalloc">Hardened memory allocator</string>
+    <string name="aep_hmalloc_footer">
+        Hardened memory allocator (hardened_malloc) provides substantial defenses against the most common classes of vulnerabilities (heap memory corruption) along with reducing the lifetime of sensitive data in memory.</string>
+    <string name="aep_hmalloc_ir_no_native_code">This app doesn’t have native code</string>
+    <string name="aep_hmalloc_ir_32_bit_native_code">This is a 32-bit app, hardened_malloc is 64-bit only</string>
+    <string name="aep_hmalloc_ir_preinstalled_app">hardened_malloc is not allowed to be disabled for a preinstalled app</string>
+    <string name="aep_hmalloc_ir_debuggable_app">This is a debuggable app, hardened_malloc can’t be disabled</string>
+
+    <string name="aep_ext_va_space">Extended virtual address space</string>
+    <string name="aep_ext_va_space_footer">Extends virtual address space from 39 to 48 bits, which significantly improves the address space layout randomization.</string>
+    <string name="aep_ext_va_space_ir_32_bit_native_code">Incompatible with 32-bit apps</string>
+    <string name="aep_ext_va_space_ir_hardened_malloc">Required by hardened_malloc</string>
+
+    <string name="aep_native_debug_title">Native code debugging</string>
+    <string name="aep_native_debug_notif_toggle_title">Show notifications about blocked access attempts</string>
+    <string name="aep_native_debug_footer">
+Native code debugging (ptrace) slightly weakens the app sandbox. Some apps (most notably banking apps) use it as a tampering detection tool.
+    </string>
+    <string name="aep_native_debug_dvr_is_system_app">Native debugging is always blocked for preinstalled apps</string>
+
+    <string name="aep_memtag">Memory tagging</string>
+    <string name="aep_memtag_notif_toggle_time">Show notifications about detected errors</string>
+    <string name="aep_memtag_footer">Memory tagging provides strong protections against exploitation of heap memory bugs (e.g. use-after-free, buffer overflow).</string>
+    <string name="aep_memtag_dvr_is_system_app">Memory tagging is always enabled for preinstalled apps</string>
+    <string name="aep_memtag_dvr_no_native_code">Memory tagging is always enabled for apps that don’t have native code</string>
+    <string name="aep_memtag_dvr_manifest_opt_in">This app has opted-in to memory tagging</string>
+
+    <string name="aep_default_memtag_main_switch_title">Enable by default</string>
+    <string name="aep_default_memtag_main_switch_summary">
+        This setting doesn’t apply to apps that are known to be compatible with memory tagging</string>
+    <string name="aep_default_memtag_footer">"Memory tagging provides strong protections against exploitation of heap memory bugs (e.g. use-after-free, buffer overflow).
+
+Memory tagging is always enabled for preinstalled apps and for third-party apps that are known to be
+compatible with it (e.g. apps that don’t have native code), regardless of this setting."</string>
+    <string name="aep_default_memtag_summary_on">Enabled by default</string>
+    <string name="aep_default_memtag_summary_off">
+        Disabled by default, except for apps that are known to be compatible with memory tagging</string>
+
+    <string name="dcl_notif_toggle_title">Show notifications about blocked DCL attempts</string>
+    <string name="aep_default_dcl_footer_ending">This setting doesn’t apply to preinstalled apps, which are always restricted from performing DCL.</string>
+
+    <string name="aep_memory_dcl">Dynamic code loading via memory</string>
+    <string name="aep_memory_dcl_short">DCL via memory</string>
+    <string name="aep_memory_dcl_dvr_is_system_app">DCL via memory is always restricted for this preinstalled app</string>
+    <string name="aep_memory_dcl_footer">
+"Dynamic code loading (DCL) via memory is usually performed by apps that use just-in-time (JIT) compilation to run code from outside their APKs.
+DCL makes the app more vulnerable to exploitation, since the dynamically loaded code can be tampered with or substituted."
+    </string>
+
+    <string name="aep_storage_dcl">Dynamic code loading via storage</string>
+    <string name="aep_storage_dcl_short">DCL via storage</string>
+    <string name="aep_storage_dcl_dvr_is_system_app">DCL via storage is always restricted for this preinstalled app</string>
+    <string name="aep_storage_dcl_footer">
+"Dynamic code loading (DCL) via storage refers to the app's ability to run third-party code from files that are not its APKs.
+DCL makes the app more vulnerable to exploitation, since the dynamically loaded code can be tampered with or substituted.
+
+Most apps that depend on Play services require DCL via storage to be allowed."
+    </string>
+
+    <string name="aep_webview_jit">WebView JIT</string>
+    <string name="aep_webview_jit_footer">
+"WebView is an OS component that is used for displaying web content inside apps.
+Just-in-time code compilation (JIT) significantly improves the WebView performance, but makes the app more vulnerable to exploitation.
+
+This setting doesn’t apply to preinstalled apps, WebView JIT is always disabled for the vast majority of them."
+    </string>
+
+</resources>
diff --git a/res/values/strings_ext.xml b/res/values/strings_ext.xml
new file mode 100644
index 00000000000..a1430b72847
--- /dev/null
+++ b/res/values/strings_ext.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hardware_sku">Hardware SKU</string>
+    <string name="auto_off_never">Never</string>
+
+    <string name="bool_setting_enable">Enable</string>
+    <string name="bool_setting_enabled">Enabled</string>
+    <string name="bool_setting_disabled">Disabled</string>
+
+    <string name="exploit_protection_settings">Exploit protection</string>
+
+    <string name="app_exploit_protection_category">App exploit protection</string>
+
+    <string name="scramble_pin_title">Scramble PIN input layout</string>
+
+    <string name="sandboxed_google_play">Sandboxed Google Play</string>
+    <string name="sandboxed_google_play_work_profile">Sandboxed Google Play (work profile)</string>
+
+    <string name="user_settings_send_censored_notifications_to_current">Send notifications to current user</string>
+    <string name="user_settings_send_censored_notifications_to_current_summary">Your lock screen notifications will be forwarded to the current user if you are active in the background. Only the user\'s name, the app\'s name, and the time received will be shown.</string>
+
+    <string name="auto_grant_OTHER_SENSORS_permission_title">Allow Sensors permission to apps by default</string>
+    <string name="auto_grant_OTHER_SENSORS_permission_summary_on">Sensors is a non-standard permission, apps may malfunction if it’s denied.</string>
+    <string name="auto_grant_OTHER_SENSORS_permission_summary_off">A permission prompt will be shown when an app tries to access sensors. Note that some apps may need to be manually restarted after allowing the Sensors permission.</string>
+
+    <string name="keyguard_camera_title">Allow camera access when locked</string>
+
+    <string name="auto_reboot_title">Auto reboot</string>
+    <string name="auto_reboot_footer">Automatically reboot the device if it hasn\'t been unlocked within the selected duration of time.</string>
+
+    <string name="screenshot_timestamp_exif_title">Save screenshot timestamp to EXIF</string>
+    <string name="screenshot_timestamp_exif_summary">Enables adding a timestamp to screenshot EXIF metadata</string>
+
+    <string name="pref_gnss_supl_title">Secure User Plane Location (SUPL)</string>
+    <string name="pref_gnss_supl_footer">A-GNSS (assisted satellite geolocation) based on nearby cell towers.</string>
+
+    <string name="supl_enabled_grapheneos_proxy">GrapheneOS proxy</string>
+    <string name="supl_enabled_standard_server">Standard server</string>
+    <string name="supl_disabled">Off</string>
+    <string name="supl_disabled_summary">Will make acquiring location lock significantly slower, especially if PSDS is turned off too</string>
+
+    <string name="g_euicc_lpa_title">eSIM support</string>
+    <string name="g_euicc_lpa_enable_dialog_msg">
+A device restart is required to enable this setting.
+    </string>
+    <string name="g_euicc_lpa_disable_dialog_title">Warning</string>
+    <string name="g_euicc_lpa_disable_dialog_msg">
+"Turning off eSIM support will break the following functionality:
+
+• adding new eSIMs
+• turning existing eSIMs on or off
+• removing eSIMs, including from the lock screen (e.g. when eSIM is locked with a forgotten PIN)
+• wiping eSIMs during factory reset
+
+Device will be automatically restarted."
+    </string>
+    <string name="g_euicc_lpa_restart_button">Restart</string>
+    <string name="g_euicc_lpa_proceed_button">Proceed</string>
+
+    <string name="remote_provisioning_title">Attestation key provisioning</string>
+    <string name="remote_provisioning_enabled_grapheneos_proxy">GrapheneOS proxy</string>
+    <string name="remote_provisioning_enabled_google_server">Google server</string>
+    <string name="remote_provisioning_disabled">Off</string>
+
+    <string name="Google_apps_special_accelerator_access_title">Special access to hardware accelerators for Google apps</string>
+    <string name="Google_apps_special_accelerator_access_summary_granted">Access granted</string>
+    <string name="Google_apps_special_accelerator_access_summary_not_granted">Access not granted</string>
+    <string name="Google_apps_special_accelerator_access_main_switch">Grant special access to hardware accelerators to Google apps</string>
+    <string name="Google_apps_special_accelerator_access_footer">
+"Some Google apps expect to be able to access hardware accelerators in a special, more capable way than regular apps do.
+
+Examples of such apps:
+• Pixel Camera
+• Google Photos
+• Google Recorder
+
+This setting applies to all users on the device."
+    </string>
+
+    <string name="pref_gnss_psds_title">Predicted Satellite Data Service (PSDS)</string>
+    <string name="gnss_psds_footer">
+"If PSDS is turned on, static PSDS information files will be downloaded periodically to improve location resolution speed and accuracy.
+No query or data is sent to the server. These files contain orbits and statuses of satellites, Earth environmental data and time adjustment information."
+</string>
+    <string name="psds_enabled_grapheneos_server">GrapheneOS server</string>
+    <string name="psds_enabled_standard_server">Standard server</string>
+    <string name="psds_disabled">Off</string>
+    <string name="psds_disabled_summary">Will make acquiring location lock significantly slower, especially if SUPL is turned off too</string>
+
+    <string name="contact_scopes">Contact Scopes</string>
+
+    <string name="storage_scopes">Storage Scopes</string>
+
+    <string name="conn_checks_grapheneos_server">GrapheneOS server</string>
+    <string name="conn_checks_google_server">Standard (Google) server</string>
+    <string name="conn_checks_disabled">Off</string>
+
+    <string name="conn_checks_title">Internet connectivity checks</string>
+    <string name="conn_checks_footer">
+"Connectivity check is a special empty server request that is made to find out whether the current network has internet connection.
+There are HTTP, HTTPS, DNS, DNS-over-TLS and DNS-over-HTTPS connectivity checks.
+    </string>
+
+    <string name="wifi_auto_off_title">Turn off Wi-Fi automatically</string>
+    <string name="wifi_auto_off_footer">If Wi-Fi is disconnected, it will be turned off after the selected timeout.</string>
+
+    <string name="bluetooth_auto_off_title">Turn off Bluetooth automatically</string>
+    <string name="bluetooth_auto_off_footer">
+"If there are no connected devices, Bluetooth will turn off after the selected timeout."
+    </string>
+
+    <string name="exec_spawning_title">Secure app spawning</string>
+    <string name="exec_spawning_title_inner">Use secure app spawning</string>
+    <string name="exec_spawning_reboot_dialog">A device restart is required to change this setting.</string>
+    <string name="exec_spawning_reboot_dialog_btn_restart">Restart</string>
+    <string name="exec_spawning_footer">Launch apps in a more secure way than Android which takes slightly longer and increases memory usage by app processes.</string>
+
+    <string name="widevine_provisioning_title">Widevine provisioning</string>
+    <string name="widevine_provisioning_enabled_grapheneos_proxy">GrapheneOS proxy</string>
+    <string name="widevine_provisioning_enabled_google_server">Google server</string>
+    <string name="widevine_provisioning_footer">The provisioned certificate will be used for accessing DRM protected content.</string>
+
+    <!-- Title of preference to enable app installs and updates [CHAR LIMIT=40] -->
+    <string name="user_app_install">App installs and updates</string>
+    <!-- Options for setting app install and updates per user -->
+    <string name="user_app_install_enabled">Enabled</string>
+    <string name="user_app_install_enabled_first_party_sources">Enabled for first party sources</string>
+    <string name="user_app_install_disabled">Disabled</string>
+    <!-- Description for options for setting app installs and updates per user -->
+    <string name="user_app_install_enabled_desc">Enable app installs and updates</string>
+    <string name="user_app_install_enabled_first_party_sources_desc">Enable app installs and updates from first party sources only</string>
+    <string name="user_app_install_disabled_desc">Disable app installs and updates</string>
+    <!-- Title of preference to enable running in background [CHAR LIMIT=40] -->
+    <string name="user_run_in_background">Allow running in background</string>
+
+    <string name="allow_automatic_per_app_epcm_title">Automatic exploit protection compatibility mode</string>
+
+    <string name="allow_automatic_per_app_epcm_summary">
+"Allow automatically disabling exploit protections for apps that are known to need it"
+    </string>
+
+    <string name="app_exploit_protection_default_value_warning">"Warning: enabling this setting might cause some apps to stop working.</string>
+
+    <string name="allow_access_to_obb_directory_title">Allow access to Android/obb folder</string>
+    <string name="allow_access_to_obb_directory_summary">Required for installation of some large apps (mostly games) that use OBB expansion files</string>
+
+    <string name="battery_share_description">Charge other devices by placing them on the back of your phone</string>
+    <string name="battery_share">Battery share</string>
+
+    <string name="show_system_process_crash_notifs_title">Notify about system process crashes</string>
+    <string name="show_system_process_crash_notifs_summary">Such crashes may indicate exploitation attempts</string>
+
+    <string name="view_logs">View logs</string>
+
+    <string name="usbc_port_title">USB-C port</string>
+    <string name="usbc_port_off_title">Off</string>
+    <string name="usbc_port_off_summary">Turns off the USB-C port.
+        Doesn’t impact the separate charging mode, which is activated by turning off the device and plugging it in to a charger.
+    </string>
+    <string name="usbc_port_charging_only_title">Charging-only</string>
+    <string name="usbc_port_charging_only_summary">Turns off all non-charging USB-C port functionality.</string>
+    <string name="usbc_port_charging_only_when_locked_title">Charging-only when locked</string>
+    <string name="usbc_port_charging_only_when_locked_summary">Enables the charging-only mode when the
+        device is locked and disables it when the device becomes unlocked. If the port is already
+        plugged-in at the time when the device becomes locked, then the activation of charging-only
+        mode will be delayed until the port is disconnected.</string>
+    <string name="usbc_port_charging_only_when_locked_afu_title">Charging-only when locked, except before first unlock</string>
+    <string name="usbc_port_charging_only_when_locked_afu_summary">This mode has the same behavior
+        as the “%1$s” mode, except for an additional exemption for before-first-unlock connections.
+    </string>
+    <string name="usbc_port_on_title">On</string>
+    <string name="usbc_port_on_summary">Does not add any restrictions.</string>
+
+    <string name="usbc_port_and_pogo_pins_title">USB-C port and pogo pins</string>
+    <string name="usbc_port_and_pogo_pins_off_title">USB-C port off, pogo pins used only for charging</string>
+    <string name="usbc_port_and_pogo_pins_off_summary">Turns off the USB-C port and turns off all
+        non-charging pogo pins functionality. Doesn’t impact the separate charging mode, which is
+        activated by turning off the device and plugging it in to a charger.
+    </string>
+    <string name="usbc_port_and_pogo_pins_charging_only_summary">Turns off all non-charging USB-C port and pogo pins functionality.</string>
+    <string name="usbc_port_and_pogo_pins_charging_only_when_locked_summary">Enables the charging-only mode when the
+        device is locked and disables it when the device becomes unlocked. If the port is already
+        plugged-in at the time when the device becomes locked, then the activation of charging-only
+        mode will be delayed until the port is disconnected. The same behavior applies to pogo pins.
+    </string>
+
+    <string name="duress_pwd_pref_title">Duress password</string>
+    <string name="duress_pwd_description">"Duress password can be entered instead of the user password in any place that asks for it, such as the lock screen of any user and any user or work profile password prompt.
+
+Submitting the duress password will immediately make the storage contents permanently inaccessible, delete all eSIMs and then power off the device. GrapheneOS will remain installed.
+
+Duress PIN works the same way duress password does."</string>
+    <string name="duress_pwd_enter_pin">Enter duress PIN</string>
+    <string name="duress_pwd_confirm_pin">Confirm duress PIN</string>
+    <string name="duress_pwd_enter_password">Enter duress password</string>
+    <string name="duress_pwd_confirm_password">Confirm duress password</string>
+    <string name="duress_pwd_action_add">Add duress PIN and password</string>
+    <string name="duress_pwd_add_button">Add</string>
+    <string name="duress_pwd_toast_added">Added duress PIN and password</string>
+    <string name="duress_pwd_toast_updated">Updated duress PIN and password</string>
+    <string name="duress_pwd_update_button">Update</string>
+    <string name="duress_pwd_cancel_button">Cancel</string>
+    <string name="duress_pwd_proceed_button">Proceed</string>
+    <string name="duress_pwd_delete_button">Delete</string>
+    <string name="duress_pwd_action_update">Update duress PIN and password</string>
+    <string name="duress_pwd_action_delete">Delete duress PIN and password</string>
+    <string name="duress_pwd_action_delete_confirmation">Delete duress PIN and password?</string>
+    <string name="duress_pwd_save_warning_title">WARNING</string>
+    <string name="duress_pwd_save_warning_text">"Submitting the duress PIN/password instead of the user PIN/password <b>will immediately make the storage contents permanently inaccessible</b> and will delete all eSIMs."</string>
+    <string name="duress_pwd_save_error">Duress PIN and password were not saved.\n\nDetails:\n%1$s</string>
+    <string name="duress_pwd_delete_error">Duress PIN and password were not deleted.\n\nDetails:\n%1$s</string>
+    <string name="duress_pwd_error_dialog_dismiss">Dismiss</string>
+
+    <string name="alt_touchscreen_mode_title">Alternative touchscreen mode</string>
+    <string name="alt_touchscreen_mode_summary">This mode is less susceptible to ghost touches. Don’t enable it unless you are experiencing touchscreen issues.</string>
+    <string name="alt_touchscreen_mode_confirm_message">Confirm that the touchscreen is working. Without confirmation, alternative touchscreen mode will be disabled after several seconds.</string>
+    <string name="alt_touchscreen_mode_confirm_button">Confirm</string>
+
+    <string name="app_play_integrity_api">Play Integrity API</string>
+    <string name="app_play_integrity_top_intro">The Play Integrity API allows services to verify properties of a device through their app. Most services check for the device or strong integrity level which requires having the unmodified stock OS on a device licensing Google Mobile Services. Not every app using it will ban using GrapheneOS. GrapheneOS passes the basic integrity level and the miscellaneous checks for licensing, Play Protect, etc. work fine. We recommend leaving feedback for apps using it to ban GrapheneOS asking them to stop banning using a much more secure OS. Apps can use the standard Android hardware attestation API to verify the hardware, OS and app with GrapheneOS.</string>
+    <string name="app_play_integrity_contact_app_developer">Contact app developer</string>
+    <string name="app_play_integrity_show_usage_notifications">Show usage notifications</string>
+    <string name="app_play_integrity_block_usage_attempts">Block usage attempts</string>
+    <string name="app_play_integrity_block_usage_attempts_summary_on">
+        Play Integrity API usage attempts will fail with the “API is not available” error code
+    </string>
+    <string name="app_play_integrity_api_blocked">Blocked</string>
+    <string name="app_play_integrity_api_not_blocked">Not blocked</string>
+    <string name="app_play_integrity_see_all_apps">Show apps that used the Play Integrity API</string>
+
+    <string name="network_location_title">Network location</string>
+    <string name="network_location_footer">
+"Network location is a method of determining your device’s location by using various nearby signals, such as Wi-Fi networks, Bluetooth devices, and cell towers. Your device scans for these signals and sends their identifiers to a server, which then provides positioning data that your device uses to estimate its location. Currently, Wi-Fi networks and cell towers are used.
+
+This method can be particularly useful when GNSS is unavailable or unreliable, such as indoors or in areas with poor satellite reception. Network location provides a quicker way to determine your location before a GNSS lock is acquired or when GNSS signals are weak."
+    </string>
+    <string name="network_location_enabled_grapheneos_apple_proxy">GrapheneOS Apple proxy</string>
+    <string name="network_location_enabled_apple">Apple server</string>
+    <string name="network_location_enabled_apple_china">Apple China server (required for China data)</string>
+    <string name="network_location_disabled">Off</string>
+
+    <string name="cross_profile_clipboard_access_title">Cross-profile shared clipboard</string>
+    <string name="cross_profile_clipboard_access_allow_defaults_title">Follow defaults</string>
+    <string name="cross_profile_clipboard_access_allow_defaults_summary">Allow system defaults sharing the clipboard from and to the parent user and its other child profiles.</string>
+    <string name="cross_profile_clipboard_access_allow_import_defaults_title">Follow import defaults</string>
+    <string name="cross_profile_clipboard_access_allow_import_defaults_summary">Allow system defaults sharing the clipboard from the parent user and its other child profiles.</string>
+    <string name="cross_profile_clipboard_access_allow_export_defaults_title">Follow export defaults</string>
+    <string name="cross_profile_clipboard_access_allow_export_defaults_summary">Allow system defaults sharing the clipboard to the parent user and its other child profiles.</string>
+    <string name="cross_profile_clipboard_access_disallow_title">Disallowed</string>
+    <string name="cross_profile_clipboard_access_disallow_summary">Disallow sharing the clipboard from and to the parent user and its other child profiles.</string>
+    <string name="cross_profile_clipboard_access_footer">This setting provides an option for users
+        to allow or disallow sharing clipboard to and from other profiles of the same parent user including itself.
+        Once disallowed, future clipboard content updates between user profiles of the same parent user,
+        such as between private space profile and parent user, or between private space profile and work profile,
+        will not be accessible. Clipboard contents shared with other profiles prior to selecting a
+        stricter option remain accessible until clipboard contents have been updated.
+    </string>
+
+    <string name="ps_disallow_delayed_locking_title">End session immediately on lock</string>
+    <string name="ps_disallow_delayed_locking_description">
+        Disallow delayed locking of storage when stopping or locking the current private profile.
+        This allows locking to work like end session to full secondary users
+        where strong authentication is required to unlock the storage.
+    </string>
+    
+    <string name="geocoder_title">Geocoder</string>
+    <string name="geocoder_footer">
+"Forward and reverse geocoding are processes used to convert between geographic coordinates and human-readable addresses, respectively. Forward geocoding returns the coordinates for a given address, while reverse geocoding returns the address or addresses near a given set of coordinates. Apps can choose to use the geocoder selected here, which performs these lookups using a network-based service."
+    </string>
+    <string name="geocoder_enabled_grapheneos_proxy">GrapheneOS proxy</string>
+    <string name="geocoder_enabled_nominatim_server">Nominatim server</string>
+    <string name="geocoder_disabled">Off</string>
+
+    <string name="carrier_settings_override_gos_title">Carrier settings overrides</string>
+    <string name="carrier_settings_override_intro_text">
+Override device carrier settings for this SIM. Choose your overrides first before enabling.
+    </string>
+    <string name="carrier_settings_override_footer">
+These local overrides may reveal hidden IMS options for your SIM, but functionality depends on carrier support and provisioning.
+May cause unreliable service. Use at your own risk.
+    </string>
+    <string name="carrier_settings_override_intro_text_expand">Expand</string>
+    <string name="carrier_settings_override_intro_text_collapse">Collapse</string>
+    <string name="carrier_settings_override_error_title">Error</string>
+    <string name="carrier_settings_override_error_unable_to_connect_to_config__s">Unable to connect to subscription service (%1$s)</string>
+    <string name="carrier_settings_override_no_override_selected_title">Cannot enable overrides</string>
+    <string name="carrier_settings_override_no_override_selected_message">No overrides are active. All settings are at their defaults.</string>
+    <string name="carrier_settings_override_main_switch_title">Enable overrides</string>
+    <string name="carrier_settings_override_active_title">Overrides active</string>
+    <string name="carrier_settings_override_unrecognized_category_title">Unknown overrides</string>
+    <string name="carrier_settings_override_unrecognized_warning_title">Warning</string>
+    <string name="carrier_settings_override_unrecognized_warning_summary">These carrier config overrides are not set from this screen.</string>
+    <string name="carrier_settings_override_active_summary">Disable overrides to make changes</string>
+    <string name="carrier_settings_override_apply_button">Apply carrier config override</string>
+    <string name="carrier_settings_override_clear_button">Clear all carrier config overrides</string>
+    <string name="carrier_settings_default_bool_true">Available</string>
+    <string name="carrier_settings_default_bool_false">Unavailable</string>
+    <string name="carrier_settings_default_unknown">Unknown</string>
+    <string name="carrier_settings_override_bool_true">Forced available</string>
+    <string name="carrier_settings_override_bool_false">Forced unavailable</string>
+    <string name="carrier_settings_override_default__s">No override (Default: %1$s)</string>
+    <string name="carrier_settings_override_volte_availability">VoLTE / Vo4G availability</string>
+    <string name="carrier_settings_override_volte_availability_description">Depends on carrier provisioning, availability, etc.</string>
+    <string name="carrier_settings_override_vonr_enable">VoNR / Vo5G availability</string>
+    <string name="carrier_settings_override_vonr_enable_description">Depends on carrier provisioning, availability, etc.</string>
+    <string name="carrier_settings_override_5g_title">5G capabilities</string>
+    <string name="carrier_settings_override_5g_description">Override carrier 5G NR availability for the non-standalone (NSA) and the standalone (SA) modes of 5G NR</string>
+    <string name="carrier_settings_override_5g_enabled_all_modes">Force NSA and SA</string>
+    <string name="carrier_settings_override_5g_default_all_modes">NSA and SA</string>
+    <string name="carrier_settings_override_5g_enabled_nsa">Force NSA</string>
+    <string name="carrier_settings_override_5g_default_nsa">NSA</string>
+    <string name="carrier_settings_override_5g_enabled_sa">Force SA</string>
+    <string name="carrier_settings_override_5g_default_sa">SA</string>
+    <string name="carrier_settings_override_5g_disabled">Force disabled</string>
+    <string name="carrier_settings_default_5g_disabled">Disabled</string>
+    <string name="carrier_settings_override_wfc_availability">Wi-Fi calling availability</string>
+    <string name="carrier_settings_override_wfc_availability_description">Depends on carrier provisioning, availability etc. VoLTE / Vo4G should be set to available to use this.</string>
+    <string name="carrier_settings_override_wfc_availability_on_summary">Includes Wi-Fi calling while roaming</string>
+    <string name="carrier_settings_override_wfc_availability_enabled_not_editable">Available but state uneditable</string>
+    <string name="carrier_settings_override_wfc_availability_enabled_roaming_not_editable">Available but roaming not editable</string>
+    <string name="carrier_settings_override_cross_sim">Cross SIM calling / backup calling availability</string>
+    <string name="carrier_settings_override_cross_sim_description">Only for dual SIM setups. If enabled, then when the SIM is roaming or out of service and Wi‑Fi isn\’t available, calls can be made over another SIM’s data connection. Wi-Fi calling should be set to available to use this.</string>
+</resources>
diff --git a/res/values/strings_google.xml b/res/values/strings_google.xml
new file mode 100644
index 00000000000..5918173804c
--- /dev/null
+++ b/res/values/strings_google.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- SettingsGoogle -->
+    <string name="charging_optimization_charge_label"/>
+    <string name="charging_optimization_reach_limit_charge_label"/>
+    <string name="charging_optimization_reach_limit_remaining_time_label"/>
+    <string name="charging_optimization_remaining_time_label"/>
+    <string name="touch_sensitivity_title"/>
+    <string name="touch_sensitivity_summary"/>
+    <string name="charge_cycle_count"/>
+    <string name="battery_tip_early_replacement_summary"/>
+    <string name="help_url_battery_replacement"/>
+    <string name="battery_tip_replacement_title"/>
+    <string name="battery_tip_replacement_summary"/>
+    <string name="emission_frequency_summary"/>
+    <string name="emission_frequency_title"/>
+    <string name="enable_glanceable_hub_toggle_summary"/>
+
+    <!-- SettingsIntelligenceGoogle -->
+    <string name="charge_limit_indexing_keywords"/>
+    <string name="charging_optimization_footer_message_charge_limit"/>
+    <string name="charging_optimization_entry_summary_charge_limit"/>
+    <string name="charging_optimization_summary_off"/>
+    <string name="charging_optimization_title"/>
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index edba6357348..613085e0e56 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -254,6 +254,10 @@
         <item name="android:background">@color/settingslib_materialColorSurfaceContainerLowest</item>
     </style>
 
+    <style name="Theme.DeviceDefault.DayNight.NoEdgeToEdge" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+
     <style name="IdentityCheckPromoCardActivityTheme" parent="@style/Theme.MaterialComponents.DayNight">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 0ba60474da2..b254fe7b36b 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -150,6 +150,7 @@
 
         <!-- LockPatternView colors -->
         <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
+        <item name="sudUseBottomProgressBar">true</item>
     </style>
 
     <style name="GlifV4Theme.Light" parent="SudThemeGlifV4.Light">
@@ -168,6 +169,7 @@
         <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
 
         <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
+        <item name="sudUseBottomProgressBar">true</item>
     </style>
 
     <style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index a6e9a53f1a3..7f3beeeed3a 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -72,6 +72,14 @@
             settings:keywords="@string/keywords_magnification"
             settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
 
+        <SwitchPreferenceCompat
+            android:key="high_emission_frequency"
+            android:icon="@drawable/ic_high_emission_frequency"
+            android:persistent="false"
+            android:title="@string/emission_frequency_title"
+            android:summary="@string/emission_frequency_summary"
+            settings:controller="com.google.android.settings.display.HighEmissionFrequencyController"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index b6874973b22..8233a1f8a72 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -134,4 +134,17 @@
         </Preference>
     </PreferenceCategory>
 
+    <Preference
+        android:key="sandboxed_google_play"
+        android:title="@string/sandboxed_google_play"
+        android:order="-980"
+        settings:controller="com.android.settings.applications.GmsCompatAppController"/>
+
+    <Preference
+        android:key="sandboxed_google_play_work_profile"
+        android:title="@string/sandboxed_google_play_work_profile"
+        android:order="-979"
+        settings:forWork="true"
+        settings:controller="com.android.settings.applications.GmsCompatAppController"/>
+
 </PreferenceScreen>
diff --git a/res/xml/biometric_second_factor_pin_settings.xml b/res/xml/biometric_second_factor_pin_settings.xml
new file mode 100644
index 00000000000..4fca3a8db79
--- /dev/null
+++ b/res/xml/biometric_second_factor_pin_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="biometric_second_factor_pin_settings"
+    android:title="@string/biometric_second_factor_pin_settings_title"
+    settings:searchable="false">
+
+    <androidx.preference.Preference
+        android:key="change_pin"
+        android:title="@string/biometric_second_factor_pin_change_title" />
+
+    <androidx.preference.Preference
+        android:key="delete_pin"
+        android:title="@string/biometric_second_factor_pin_delete_title" />
+
+    <PreferenceCategory
+        android:title="@string/biometric_second_factor_pin_settings_category_title">
+
+        <SwitchPreferenceCompat
+            android:key="scramble_pin_layout"
+            android:title="@string/scramble_pin_title" />
+
+        <SwitchPreferenceCompat
+            android:key="enhancedPinPrivacy"
+            android:title="@string/lockpattern_settings_enhanced_pin_privacy_title"
+            android:summary="@string/lockpattern_settings_enhanced_pin_privacy_summary" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory>
+
+        <com.android.settingslib.widget.FooterPreference
+            android:title="@string/biometric_second_factor_pin_description"
+            android:selectable="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 33f328fc819..2ee45e65f60 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -182,6 +182,18 @@
             android:summary="@string/peak_refresh_rate_summary"
             settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
 
+        <SwitchPreferenceCompat
+            android:key="touch_sensitivity"
+            android:title="@string/touch_sensitivity_title"
+            android:summary="@string/touch_sensitivity_summary"
+            settings:controller="com.android.settings.display.TouchSensitivityPreferenceController" />
+
+        <SwitchPreferenceCompat
+            android:key="alt_touchscreen_mode"
+            android:title="@string/alt_touchscreen_mode_title"
+            android:summary="@string/alt_touchscreen_mode_summary"
+            settings:controller="com.android.settings.display.AltTouchscreenModePrefController" />
+
         <SwitchPreferenceCompat
             android:key="show_operator_name"
             android:title="@string/show_operator_name_title"
diff --git a/res/xml/exploit_protection_settings.xml b/res/xml/exploit_protection_settings.xml
new file mode 100644
index 00000000000..73038bbeded
--- /dev/null
+++ b/res/xml/exploit_protection_settings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="exploit_protection_settings"
+    android:title="@string/exploit_protection_settings">
+
+    <Preference
+        android:key="auto_reboot"
+        android:title="@string/auto_reboot_title"
+        settings:controller="com.android.settings.security.AutoRebootPrefController" />
+
+    <Preference
+        android:key="usbc_port"
+        android:title="@string/usbc_port_title"
+        settings:controller="com.android.settings.security.UsbPortSecurityPrefController" />
+
+    <Preference
+        android:key="usbc_port_and_pogo_pins"
+        android:title="@string/usbc_port_and_pogo_pins_title"
+        settings:controller="com.android.settings.security.UsbPortSecurityPrefController" />
+
+    <Preference
+        android:key="wifi_auto_off"
+        android:title="@string/wifi_auto_off_title"
+        settings:controller="com.android.settings.wifi.WifiAutoOffPrefController"/>
+
+    <Preference
+        android:key="bluetooth_auto_off"
+        android:title="@string/bluetooth_auto_off_title"
+        settings:controller="com.android.settings.bluetooth.BluetoothAutoOffPrefController"/>
+
+    <PreferenceCategory
+        android:key="app_exploit_protection_settings"
+        android:title="@string/app_exploit_protection_category">
+
+        <Preference
+            android:key="aep_h_malloc_app_list"
+            android:title="@string/aep_hmalloc"
+            settings:controller="com.android.settings.applications.HardenedMallocAppListPrefController" />
+
+        <Preference
+            android:key="aep_memtag"
+            android:title="@string/aep_memtag"
+            android:fragment="com.android.settings.applications.AppDefaultMemtagFragment"
+            settings:controller="com.android.settings.applications.AppDefaultMemtagPrefController" />
+
+        <Preference
+            android:key="aep_memtag_app_list"
+            android:title="@string/aep_memtag"
+            settings:controller="com.android.settings.applications.MemtagAppListPrefController" />
+
+        <Preference
+            android:key="aep_extended_va_space_app_list"
+            android:title="@string/aep_ext_va_space"
+            settings:controller="com.android.settings.applications.ExtendedVaSpaceAppListPrefController" />
+
+        <Preference
+            android:key="aep_native_debugging"
+            android:title="@string/aep_native_debug_title"
+            android:fragment="com.android.settings.applications.AppDefaultNativeDebuggingFragment"
+            settings:controller="com.android.settings.applications.AppDefaultNativeDebuggingPrefController" />
+
+        <Preference
+            android:key="aep_native_debugging_app_list"
+            android:title="@string/aep_native_debug_title"
+            settings:controller="com.android.settings.applications.NativeDebuggingAppListPrefController" />
+
+        <Preference
+            android:key="aep_webview_jit"
+            android:title="@string/aep_webview_jit"
+            android:fragment="com.android.settings.applications.AppDefaultWebViewDynCodeLoadingFragment"
+            settings:controller="com.android.settings.applications.AppDefaultWebViewDynCodeLoadingPrefController" />
+
+        <Preference
+            android:key="aep_webview_jit_app_list"
+            android:title="@string/aep_webview_jit"
+            settings:controller="com.android.settings.applications.WebViewDynCodeLoadingAppListPrefController" />
+
+        <Preference
+            android:key="aep_memory_dcl"
+            android:title="@string/aep_memory_dcl"
+            android:fragment="com.android.settings.applications.AppDefaultMemoryDynCodeLoadingFragment"
+            settings:controller="com.android.settings.applications.AppDefaultMemoryDynCodeLoadingPrefController" />
+
+        <Preference
+            android:key="aep_memory_dcl_app_list"
+            android:title="@string/aep_memory_dcl"
+            settings:controller="com.android.settings.applications.MemoryDynCodeLoadingAppListPrefController" />
+
+        <Preference
+            android:key="aep_storage_dcl"
+            android:title="@string/aep_storage_dcl"
+            android:fragment="com.android.settings.applications.AppDefaultStorageDynCodeLoadingFragment"
+            settings:controller="com.android.settings.applications.AppDefaultStorageDynCodeLoadingPrefController" />
+
+        <Preference
+            android:key="aep_storage_dcl_app_list"
+            android:title="@string/aep_storage_dcl"
+            settings:controller="com.android.settings.applications.StorageDynCodeLoadingAppListPrefController" />
+
+        <Preference
+            android:key="exec_spawning"
+            android:title="@string/exec_spawning_title"
+            android:fragment="com.android.settings.security.ExecSpawningFragment"
+            settings:controller="com.android.settings.security.ExecSpawningPrefController" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/firmware_version.xml b/res/xml/firmware_version.xml
index 41f7733cfb2..05558648763 100644
--- a/res/xml/firmware_version.xml
+++ b/res/xml/firmware_version.xml
@@ -54,6 +54,15 @@
         settings:enableCopying="true"
         settings:controller="com.android.settings.deviceinfo.firmwareversion.BasebandVersionPreferenceController"/>
 
+    <!-- Bootloader -->
+    <Preference
+        android:key="boot_loader"
+        android:title="@string/bootloader_version"
+        android:summary="@string/summary_placeholder"
+        android:selectable="false"
+        settings:enableCopying="true"
+        settings:controller="com.android.settings.deviceinfo.firmwareversion.BootloaderVersionPreferenceController"/>
+
     <!-- Kernel -->
     <Preference
         android:key="kernel_version"
diff --git a/res/xml/hardware_info.xml b/res/xml/hardware_info.xml
index e086a486ee0..8fef9371870 100644
--- a/res/xml/hardware_info.xml
+++ b/res/xml/hardware_info.xml
@@ -57,4 +57,13 @@
         settings:controller="com.android.settings.deviceinfo.hardwareinfo.ManufacturedYearPreferenceController"
         settings:enableCopying="true"/>
 
+    <!-- Device SKU -->
+    <Preference
+        android:key="hardware_info_device_sku"
+        android:title="@string/hardware_sku"
+        android:summary="@string/summary_placeholder"
+        android:selectable="false"
+        settings:controller="com.android.settings.deviceinfo.hardwareinfo.HardwareSkuPreferenceController"
+        settings:enableCopying="true"/>
+
 </PreferenceScreen>
diff --git a/res/xml/location_services.xml b/res/xml/location_services.xml
index c3734ede4ba..e33f3a5eace 100644
--- a/res/xml/location_services.xml
+++ b/res/xml/location_services.xml
@@ -34,4 +34,16 @@
             android:title="@string/location_scanning_bluetooth_always_scanning_title"
             settings:controller="com.android.settings.location.LocationServicesBluetoothScanningPreferenceController"/>
 
+        <com.android.settingslib.RestrictedPreference
+            android:order="1002"
+            android:key="location_services_network_location"
+            android:title="@string/network_location_title"
+            settings:controller="com.android.settings.location.LocationServicesNetworkLocationPreferenceController"/>
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="location_services_geocoder"
+            android:order="1003"
+            android:title="@string/geocoder_title"
+            settings:controller="com.android.settings.location.LocationServicesGeocoderPreferenceController" />
+
 </PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 5d5c6b6cd38..c115ccf6486 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -77,6 +77,16 @@
             android:title="@string/location_services_preference_title"
             settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>
 
+        <Preference
+            android:key="gnss_supl"
+            android:title="@string/pref_gnss_supl_title"
+            settings:controller="com.android.settings.location.GnssSuplPrefController"/>
+
+        <Preference
+            android:key="gnss_psds"
+            android:title="@string/pref_gnss_psds_title"
+            settings:controller="com.android.settings.location.GnssPsdsPrefController"/>
+
     </com.android.settingslib.widget.UntitledPreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index a317cd04cd7..934dc6bbae0 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -183,6 +183,13 @@
             settings:controller="com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController"
             settings:enableCopying="true"/>
 
+        <!-- Settings search is handled by CarrierSettingsOverridesSearchItem. -->
+        <Preference
+            android:key="carrier_settings_override_gos"
+            android:title="@string/carrier_settings_override_gos_title"
+            settings:searchable="false"
+            settings:controller="com.android.settings.network.telephony.CarrierSettingsOverridesPreferenceController"/>
+
         <!-- IMEI -->
         <Preference
             android:key="network_mode_imei_info"
diff --git a/res/xml/more_security_privacy_settings.xml b/res/xml/more_security_privacy_settings.xml
index 0068872ef31..69b209fa4a6 100644
--- a/res/xml/more_security_privacy_settings.xml
+++ b/res/xml/more_security_privacy_settings.xml
@@ -97,6 +97,19 @@
             settings:controller=
                 "com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
 
+        <SwitchPreferenceCompat
+            android:key="privacy_auto_grant_OTHER_SENSORS_permission"
+            android:title="@string/auto_grant_OTHER_SENSORS_permission_title"
+            android:summaryOn="@string/auto_grant_OTHER_SENSORS_permission_summary_on"
+            android:summaryOff="@string/auto_grant_OTHER_SENSORS_permission_summary_off"
+            settings:boolSettingField="android.ext.settings.ExtSettings AUTO_GRANT_OTHER_SENSORS_PERMISSION"/>
+
+        <SwitchPreferenceCompat
+            android:key="privacy_screenshot_timestamp_exif"
+            android:title="@string/screenshot_timestamp_exif_title"
+            android:summary="@string/screenshot_timestamp_exif_summary"
+            settings:boolSettingField="android.ext.settings.ExtSettings SCREENSHOT_TIMESTAMP_EXIF"/>
+
         <!-- Allow software fallback for camera extensions -->
         <SwitchPreferenceCompat
             android:key="privacy_camera_extensions_fallback"
@@ -222,6 +235,21 @@
         settings:keywords="@string/keywords_app_pinning"
         settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
 
+    <SwitchPreferenceCompat
+        android:order="281"
+        android:key="show_system_process_crash_notifs"
+        android:title="@string/show_system_process_crash_notifs_title"
+        android:summary="@string/show_system_process_crash_notifs_summary"
+        settings:boolSettingField=
+            "android.ext.settings.ExtSettings SHOW_SYSTEM_PROCESS_CRASH_NOTIFICATIONS" />
+
+    <SwitchPreferenceCompat
+        android:order="282"
+        android:key="allow_automatic_per_app_epcm"
+        android:title="@string/allow_automatic_per_app_epcm_title"
+        android:summary="@string/allow_automatic_per_app_epcm_summary"
+        settings:boolSettingField="android.ext.settings.ExtSettings ALLOW_DISABLING_HARDENING_VIA_APP_COMPAT_CONFIG" />
+
     <com.android.settingslib.RestrictedPreference
         android:order="300"
         android:id="@+id/memtag_page"
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
index 7a333672317..594d307f83e 100644
--- a/res/xml/network_provider_internet.xml
+++ b/res/xml/network_provider_internet.xml
@@ -56,6 +56,14 @@
         settings:useAdminDisabledSummary="true"
         settings:controller="com.android.settings.network.MobileNetworkSummaryController" />
 
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="google_euicc_lpa"
+        android:title="@string/g_euicc_lpa_title"
+        android:icon="@drawable/ic_sim_card"
+        android:order="-14"
+        settings:controller="com.android.settings.network.GoogleEuiccLpaController"
+        settings:userRestriction="no_config_mobile_networks"/>
+
     <com.android.settingslib.RestrictedSwitchPreference
         android:key="airplane_mode_on"
         android:title="@string/airplane_mode"
@@ -118,4 +126,22 @@
         android:summary="@string/cellular_security_summary"
         android:order="30"
         settings:controller="com.android.settings.network.CellularSecurityPreferenceController"/>
+
+    <Preference
+        android:key="connectivity_checks"
+        android:title="@string/conn_checks_title"
+        android:order="30"
+        settings:controller="com.android.settings.network.ConnectivityChecksPrefController"/>
+
+    <Preference
+        android:key="remote_provisioning_settings"
+        android:title="@string/remote_provisioning_title"
+        android:order="35"
+        settings:controller="com.android.settings.network.RemoteProvisioningPrefController" />
+    
+    <Preference
+        android:key="widevine_provisioning_settings"
+        android:title="@string/widevine_provisioning_title"
+        android:order="40"
+        settings:controller="com.android.settings.network.WidevineProvisioningPrefController" />
 </PreferenceScreen>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 4890560e3f7..9cdac9ffcfc 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -44,6 +44,14 @@
         android:title="@string/summary_placeholder"
         settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
 
+    <!-- Removed tag from stock OS:  android:featureFlag="com.google.android.systemui.enable_whiskey"-->
+    <com.android.settingslib.widget.BannerMessagePreference
+        android:icon="@drawable/ic_battery_charging_full_google"
+        android:title="@string/charge_cycle_count"
+        android:key="cycle_count_tip"
+        settings:controller="com.google.android.settings.fuelgauge.batterytip.CycleCountTipPreferenceController"
+        settings:isPreferenceVisible="false" />
+
     <com.android.settingslib.widget.UntitledPreferenceCategory
         android:key="power_usage_summary_category">
         <Preference
@@ -53,6 +61,11 @@
             android:summary="@string/advanced_battery_preference_summary"
             settings:keywords="@string/keywords_battery_usage" />
 
+        <Preference
+            android:key="app_battery_usage"
+            android:title="@string/app_battery_usage_title"
+            settings:controller="com.android.settings.fuelgauge.AppBatteryUsagePrefController" />
+
         <Preference
             android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
             android:key="battery_saver_summary"
@@ -68,6 +81,16 @@
             settings:keywords="@string/keywords_battery_adaptive_preferences" />
     </com.android.settingslib.widget.UntitledPreferenceCategory>
 
+    <com.android.settingslib.widget.UntitledPreferenceCategory
+        android:key="charging_optimization_category">
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.BatteryChargingOptimizationFragment"
+            android:key="charging_optimization"
+            android:title="@string/charging_optimization_title"
+            settings:keywords="@string/charge_limit_indexing_keywords"
+            settings:controller="com.android.settings.fuelgauge.BatteryChargingOptimizationPrefController" />
+    </com.android.settingslib.widget.UntitledPreferenceCategory>
+
     <com.android.settingslib.widget.UntitledPreferenceCategory
         android:key="percentage_category">
         <SwitchPreferenceCompat
@@ -77,6 +100,15 @@
             settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
     </com.android.settingslib.widget.UntitledPreferenceCategory>
 
+    <com.android.settingslib.widget.UntitledPreferenceCategory
+        android:key="battery_share_category">
+        <SwitchPreferenceCompat
+            android:key="battery_share"
+            android:title="@string/battery_share"
+            android:summary="@string/battery_share_description"
+            settings:controller="com.android.settings.display.BatterySharePreferenceController" />
+    </com.android.settingslib.widget.UntitledPreferenceCategory>
+
     <com.android.settingslib.widget.FooterPreference
         android:key="power_usage_footer"
         android:title="@string/battery_footer_summary"
diff --git a/res/xml/private_space_hide_locked.xml b/res/xml/private_space_hide_locked.xml
index 56dd1514cad..ee7a2110aa5 100644
--- a/res/xml/private_space_hide_locked.xml
+++ b/res/xml/private_space_hide_locked.xml
@@ -18,12 +18,6 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/private_space_hide_page_title">
 
-    <com.android.settingslib.widget.IllustrationPreference
-        android:key="private_space_hide_illustration"
-        settings:searchable="false"
-        settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"
-        settings:controller="com.android.settings.privatespace.HidePrivateSpaceIllustrationController"/>
-
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="hide_when_locked"
         android:title="@string/private_space_hide_when_locked"
@@ -35,32 +29,4 @@
         android:selectable="false"
         settings:searchable="false" />
 
-    <PreferenceCategory
-        android:key="private_space_access"
-        android:title="@string/private_space_access_header"
-        settings:controller="com.android.settings.privatespace.HidePrivateSpaceCategoryController">
-
-        <Preference
-        android:key="search_when_locked_footer"
-        android:icon="@drawable/counter_1_24dp"
-        android:title="@string/private_space_search_description"
-        android:selectable="false"
-        settings:searchable="false" />
-
-        <Preference
-            android:key="tap_tile_footer"
-            android:icon="@drawable/counter_2_24dp"
-            android:title="@string/private_space_tap_tile_description"
-            android:selectable="false"
-            settings:searchable="false" />
-
-        <Preference
-            android:key="unlock_profile_footer"
-            android:icon="@drawable/counter_3_24dp"
-            android:title="@string/private_space_unlock_description"
-            android:selectable="false"
-            settings:searchable="false" />
-
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/private_space_settings.xml b/res/xml/private_space_settings.xml
index e444c80dad3..fbfe9969979 100644
--- a/res/xml/private_space_settings.xml
+++ b/res/xml/private_space_settings.xml
@@ -56,11 +56,36 @@
             settings:controller="com.android.settings.privatespace.HidePrivateSpaceSummaryController"
             settings:searchable="false" />
 
+        <Preference
+            android:key="sandboxed_google_play_private_space"
+            android:title="@string/sandboxed_google_play"
+            settings:controller="com.android.settings.applications.GmsCompatAppController"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory
         android:title="@string/private_space_category_system">
 
+        <Preference
+            android:key="private_space_cross_profile_clipboard_access_title"
+            android:title="@string/cross_profile_clipboard_access_title"
+            settings:controller="com.android.settings.privatespace.users.PsCrossProfileClipboardAccessPrefCtrl"
+            settings:searchable="false" />
+
+        <Preference
+            android:key="private_space_ext_app_copying"
+            android:title="@string/user_copy_apps_menu_title"
+            settings:controller="com.android.settings.privatespace.users.PrivateSpaceAppCopyPrefController"
+            settings:fragment="com.android.settings.users.AppCopyFragment"
+            settings:searchable="false" />
+
+        <SwitchPreferenceCompat
+            android:key="private_space_disallow_delayed_locking"
+            android:title="@string/ps_disallow_delayed_locking_title"
+            android:summary="@string/ps_disallow_delayed_locking_description"
+            settings:controller="com.android.settings.privatespace.users.PsDisallowDelayedLockingPrefController"
+            settings:searchable="false" />
+
         <Preference
             android:key="private_space_delete"
             android:title="@string/private_space_delete_title"
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
index 2c4402da89e..f06b42ceab1 100644
--- a/res/xml/screen_pinning_settings.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -30,7 +30,6 @@
 
     <com.android.settingslib.widget.FooterPreference
         android:key="screen_pinning_settings_screen_footer"
-        android:title="@string/screen_pinning_description"
         settings:searchable="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 2881969d2f8..09d5206f94b 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -29,6 +29,13 @@
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_lock_screen_notif"/>
 
+        <com.android.settingslib.PrimarySwitchPreference
+            android:title="@string/widgets_on_lockscreen_title"
+            android:key="widgets_on_lockscreen"
+            android:summary="@string/enable_glanceable_hub_toggle_summary"
+            android:fragment="com.android.settings.communal.WidgetsOnLockscreenFragment"
+            settings:controller="com.android.settings.display.WidgetsOnLockscreenPreferenceController"/>
+
         <Preference
             android:key="security_lock_screen_notifications_page"
             android:title="@string/lock_screen_notifs_title"
diff --git a/res/xml/security_settings_fingerprint.xml b/res/xml/security_settings_fingerprint.xml
index 965295826dd..65225c8d3f2 100644
--- a/res/xml/security_settings_fingerprint.xml
+++ b/res/xml/security_settings_fingerprint.xml
@@ -63,8 +63,7 @@
     <PreferenceCategory
         android:key="security_settings_fingerprint_unlock_category"
         android:title="@string/security_settings_fingerprint_settings_preferences_category"
-        settings:controller="com.android.settings.biometrics.fingerprint.FingerprintUnlockCategoryController"
-        settings:isPreferenceVisible="false">
+        settings:controller="com.android.settings.biometrics.fingerprint.FingerprintUnlockCategoryController">
 
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="@string/security_settings_require_screen_on_to_auth_key"
@@ -81,6 +80,11 @@
             settings:keywords="@string/security_settings_screen_off_unlock_udfps_keywords"
             settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsScreenOffUnlockUdfpsPreferenceController"
             settings:isPreferenceVisible="false"/>
+
+        <androidx.preference.Preference
+            android:key="biometric_second_factor_pin"
+            android:title="@string/biometric_second_factor_pin_title" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index f3f3ba42b1b..261e1d62d13 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -83,11 +83,19 @@
             android:title="@string/lock_screen_auto_pin_confirm_title"
             android:summary="@string/lock_screen_auto_pin_confirm_summary" />
 
+        <SwitchPreferenceCompat
+            android:key="scramble_pin_layout"
+            android:title="@string/scramble_pin_title" />
+
         <SwitchPreferenceCompat
             android:key="enhancedPinPrivacy"
             android:title="@string/lockpattern_settings_enhanced_pin_privacy_title"
             android:summary="@string/lockpattern_settings_enhanced_pin_privacy_summary" />
 
+        <SwitchPreferenceCompat
+            android:key="allow_keyguard_camera"
+            android:title="@string/keyguard_camera_title"
+            settings:boolSettingField="android.ext.settings.ExtSettings ALLOW_KEYGUARD_CAMERA" />
 
         <!-- available in pin/pattern/password -->
         <com.android.settings.security.screenlock.ProtectedTimeoutListPreference
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 02db847aef5..baa0ad597b5 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -23,6 +23,11 @@
             android:summaryOn="@string/sim_lock_on"
             android:summaryOff="@string/sim_lock_off"/>
 
+    <SwitchPreferenceCompat
+            android:key="sim_scramble_pin_layout"
+            android:dependency="sim_toggle"
+            android:title="@string/scramble_pin_title"/>
+
     <com.android.settings.EditPinPreference
             android:key="sim_pin"
             android:dependency="sim_toggle"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index f3a5f3216c7..32867ea63f7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -231,4 +231,10 @@
             android:name="classname"
             android:value="com.android.settings.Settings$ChangeNfcTagAppsActivity" />
     </Preference>
+
+    <Preference
+        android:key="Google_apps_special_accelerator_access"
+        android:title="@string/Google_apps_special_accelerator_access_title"
+        android:fragment="com.android.settings.applications.specialaccess.GoogleSpecialAcceleratorAccessFragment"
+        settings:controller="com.android.settings.applications.specialaccess.GoogleSpecialAcceleratorAccessPrefController" />
 </PreferenceScreen>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 2bef02855dc..557eb6be173 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -113,6 +113,13 @@
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
     </Preference>
 
+    <Preference
+        android:key="view_logs"
+        android:title="@string/view_logs"
+        android:icon="@drawable/ic_settings_development"
+        android:order="-39"
+        settings:controller="com.android.settings.system.LogcatLinkPrefController"/>
+
     <Preference
         android:key="system_multiuser"
         android:title="@string/user_settings_title"
@@ -133,6 +140,12 @@
         android:icon="@drawable/ic_device_diagnostics"
         settings:controller="com.android.settings.system.DeviceDiagnosticsPreferenceController"/>
 
+    <Preference
+        android:key="linux_terminal"
+        android:title="@string/enable_linux_terminal_title"
+        android:summary="@string/enable_linux_terminal_summary"
+        android:fragment="com.android.settings.development.linuxterminal.LinuxTerminalDashboardFragment" />
+
     <Preference
         android:key="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml
index 8e15d14bf5a..5f6df097ec9 100644
--- a/res/xml/user_details_settings.xml
+++ b/res/xml/user_details_settings.xml
@@ -25,6 +25,10 @@
             android:key="user_grant_admin"
             android:icon="@drawable/ic_admin_panel_settings"
             android:title="@string/user_grant_admin" />
+    <SwitchPreferenceCompat
+            android:icon="@drawable/ic_sync"
+            android:key="allow_run_in_background"
+            android:title="@string/user_run_in_background" />
     <SwitchPreferenceCompat
             android:key="enable_calling"
             android:icon="@drawable/ic_phone"
@@ -33,6 +37,10 @@
             android:key="app_and_content_access"
             android:icon="@drawable/ic_lock_closed"
             android:title="@string/user_restrictions_title" />
+    <com.android.settingslib.RestrictedPreference
+            android:key="app_installs"
+            android:icon="@drawable/ic_settings_install"
+            android:title="@string/user_app_install" />
     <com.android.settingslib.RestrictedPreference
             android:key="app_copying"
             android:icon="@drawable/ic_apps"
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index ec0e72818b1..413091d5cab 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -112,4 +112,10 @@
         android:fragment="com.android.settings.users.TimeoutToDockUserSettings"
         settings:controller="com.android.settings.users.TimeoutToDockUserPreferenceController"/>
 
+    <SwitchPreferenceCompat
+            android:key="user_settings_send_censored_notifications_to_current"
+            android:title="@string/user_settings_send_censored_notifications_to_current"
+            android:summary="@string/user_settings_send_censored_notifications_to_current_summary"
+            android:order="106"/>
+
 </PreferenceScreen>
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index dffbbbe3116..43f6eb91023 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -36,6 +36,7 @@
                 android:key="lockdown_vpn"
                 android:title="@string/vpn_require_connection"
                 android:defaultValue="false"
+                android:summary="@string/vpn_require_connection_summary"             
                 android:dependency="always_on_vpn"
                 settings:userRestriction="no_config_vpn"
                 settings:useAdditionalSummary="true"
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index e41a765948e..02bd47cf213 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -94,8 +94,8 @@
             android:key="privacy"
             android:icon="@drawable/ic_wifi_privacy_24dp"
             android:title="@string/wifi_privacy_settings"
-            android:entries="@array/wifi_privacy_entries"
-            android:entryValues="@array/wifi_privacy_values"/>
+            android:entries="@array/wifi_privacy_entries_ext"
+            android:entryValues="@array/wifi_privacy_values_ext"/>
 
       <SwitchPreferenceCompat
           android:key="shared"
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 2c8416c07d3..b7a3ada9302 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -23,6 +23,7 @@
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.ext.settings.ExtSettings;
 import android.graphics.PixelFormat;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -124,6 +125,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
 
     private EditPinPreference mPinDialog;
     private TwoStatePreference mPinToggle;
+    private TwoStatePreference mPinScramblingToggle;
 
     private Resources mRes;
 
@@ -196,6 +198,10 @@ public void onCreate(Bundle savedInstanceState) {
 
         mPinDialog = (EditPinPreference) findPreference(PIN_DIALOG);
         mPinToggle = (TwoStatePreference) findPreference(PIN_TOGGLE);
+        mPinScramblingToggle = (TwoStatePreference) findPreference("sim_scramble_pin_layout");
+        mPinScramblingToggle.setOnPreferenceChangeListener((preference, newValue) -> {
+            return ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT.put(requireContext(), (boolean) newValue);
+        });
         if (savedInstanceState != null) {
             if (savedInstanceState.containsKey(DIALOG_STATE)
                     && restoreDialogStates(savedInstanceState)) {
@@ -359,6 +365,8 @@ private void updatePreferences() {
                 mPinToggle.setChecked(isIccLockEnabled());
             }
         }
+
+        mPinScramblingToggle.setChecked(ExtSettings.SCRAMBLE_SIM_PIN_LAYOUT.get(requireContext()));
     }
 
     @Override
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 76d8f1667d9..45e6b805365 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -629,6 +629,21 @@ public static class ContactsStorageSettingsActivity extends SettingsActivity { /
     public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ }
     public static class MagnificationActivity extends SettingsActivity { /* empty */ }
     public static class FlashNotificationsActivity extends SettingsActivity { /* empty */ }
+
+    public static class AppMemtagActivity extends SettingsActivity {}
+
+    public static class AppHardenedMallocActivity extends SettingsActivity {}
+
+    public static class AppMemoryDynCodeLoadingActivity extends SettingsActivity {}
+
+    public static class AppNativeDebuggingActivity extends SettingsActivity {}
+
+    public static class AppStorageDynCodeLoadingActivity extends SettingsActivity {}
+
+    public static class AppManagePlayIntegrityApiActivity extends SettingsActivity {}
+
+    public static class ExploitProtectionActivity extends SettingsActivity {}
+
     public static class NotificationBundlesActivity extends SettingsActivity { /* empty */ }
     public static class NotificationSummarizationActivity extends SettingsActivity { /* empty */ }
 
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 445a77dccd8..e50d86e1a43 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -42,6 +42,7 @@
 import com.android.settings.msds.MSDLPlayerWrapper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.FeatureFactoryImpl;
+import com.google.android.settings.overlay.FeatureFactoryGoogleImpl;
 import com.android.settings.spa.SettingsSpaEnvironment;
 import com.android.settingslib.applications.AppIconCacheManager;
 import com.android.settingslib.datastore.BackupRestoreStorageManager;
@@ -76,6 +77,8 @@ protected void attachBaseContext(Context base) {
     public void onCreate() {
         super.onCreate();
 
+        VanadiumLibraryCleanup.maybeRun(this);
+
         if (Flags.catalyst()) {
             PreferenceScreenRegistry.INSTANCE.setPreferenceScreenMetadataFactories(
                     preferenceScreenFactories());
@@ -129,6 +132,9 @@ public void onTerminate() {
 
     @NonNull
     protected FeatureFactory getFeatureFactory() {
+        if ("Google".equals(android.os.Build.MANUFACTURER)) {
+            return new FeatureFactoryGoogleImpl();
+        }
         return new FeatureFactoryImpl();
     }
 
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a76beea7d87..69d8b55aa35 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -454,6 +454,12 @@ public static UserHandle getProfileOfType(
             if (Objects.equals(umUserType, userInfo.userType)) {
                 return profile;
             }
+            if (userType == ProfileType.PERSONAL) {
+                if (userInfo.canHaveProfile(USER_TYPE_PROFILE_PRIVATE)
+                        || userInfo.canHaveProfile(USER_TYPE_PROFILE_MANAGED)) {
+                    return profile;
+                }
+            }
         }
         return null;
     }
@@ -470,6 +476,12 @@ public static boolean doesProfileOfTypeExists(
             if (Objects.equals(umUserType, profile.userType)) {
                 return true;
             }
+            if (userType == ProfileType.PERSONAL) {
+                if (profile.canHaveProfile(USER_TYPE_PROFILE_PRIVATE)
+                        || profile.canHaveProfile(USER_TYPE_PROFILE_MANAGED)) {
+                    return true;
+                }
+            }
         }
         return false;
     }
diff --git a/src/com/android/settings/VanadiumLibraryCleanup.java b/src/com/android/settings/VanadiumLibraryCleanup.java
new file mode 100644
index 00000000000..79d44934827
--- /dev/null
+++ b/src/com/android/settings/VanadiumLibraryCleanup.java
@@ -0,0 +1,114 @@
+package com.android.settings;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.SigningInfo;
+import android.os.UserHandle;
+import android.util.Log;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HexFormat;
+import java.util.List;
+
+// Due to a bug in boot-time package verification extensions (PackageVerityExt), Vanadium Trichrome
+// static shared library was removed in some cases in an incorrect way. Only the library APK was
+// removed, all library package state was left behind: package setting, per-user package state,
+// per-user permission state etc.
+//
+// PackageVerityExt bug is now fixed. This one-time cleanup task removes leftover package states.
+public class VanadiumLibraryCleanup {
+    private static final String TAG = VanadiumLibraryCleanup.class.getSimpleName();
+
+    private static final String MARKER_FILE_NAME = "vanadium_trichrome_library_cleanup_done2";
+
+    public static void maybeRun(Context ctx) {
+        if (ctx.getUserId() != UserHandle.USER_SYSTEM) {
+            return;
+        }
+
+        ThreadUtils.postOnBackgroundThread(() -> {
+            try {
+                run(ctx);
+            } catch (Throwable e) {
+                // don't crash, removing these leftovers is not that important
+                Log.e(TAG, "", e);
+            }
+        });
+    }
+
+    private static void run(Context ctx) {
+        File markerFile = new File(ctx.getFilesDir(), MARKER_FILE_NAME);
+        if (markerFile.isFile()) {
+            return;
+        }
+
+        // MATCH_ANY_USER is needed in case the user has manually uninstalled these entries in USER_SYSTEM
+        int baseFlags = PackageManager.MATCH_ANY_USER | PackageManager.MATCH_UNINSTALLED_PACKAGES;
+
+        PackageManager pm = ctx.getPackageManager();
+        List<ApplicationInfo> installedPkgs =
+                pm.getInstalledApplications(baseFlags);
+
+        byte[] vanadiumCertDigest = HexFormat.of()
+                .parseHex("c6adb8b83c6d4c17d292afde56fd488a51d316ff8f2c11c5410223bff8a7dbb3");
+
+        var deleteObserver = new DeleteObserver();
+
+        for (ApplicationInfo appInfo : installedPkgs) {
+            String pkgName = appInfo.packageName;
+            // Static shared libraries have a synthetic package name:
+            // <package name> <underscore> <package version>
+            if (!pkgName.startsWith("app.vanadium.trichromelibrary_")) {
+                continue;
+            }
+
+            Log.d(TAG, "processing " + pkgName);
+            PackageInfo pkgInfo;
+            try {
+                pkgInfo = pm.getPackageInfo(pkgName, baseFlags | PackageManager.GET_SIGNING_CERTIFICATES);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e(TAG, "", e);
+                continue;
+            }
+            SigningInfo signingInfo = pkgInfo.signingInfo;
+            if (signingInfo == null) {
+                Log.w(TAG, "signingInfo is null");
+                continue;
+            }
+            if (!signingInfo.getSigningDetails().hasSha256Certificate(vanadiumCertDigest)) {
+                Log.w(TAG, "unknown signing certificate");
+                continue;
+            }
+
+            if (appInfo.sourceDir != null) {
+                Log.w(TAG, "base APK is not null");
+                continue;
+            }
+            // there's no need to check whether this ApplicationInfo represents an actual static
+            // shared library, they are filtered out by default
+
+            pm.deletePackage(pkgName, deleteObserver, PackageManager.DELETE_ALL_USERS);
+        }
+
+        try {
+            if (!markerFile.createNewFile()) {
+                Log.w(TAG, "markerFile.createNewFile() returned false");
+            }
+        } catch (IOException e) {
+            Log.w(TAG, "unable to create markerFile", e);
+        }
+    }
+
+    static class DeleteObserver extends android.content.pm.IPackageDeleteObserver.Stub {
+        @Override
+        public void packageDeleted(String packageName, int returnCode) {
+            Log.d(TAG, "packageDeleted callback for " + packageName
+                    + ", result " + PackageManager.deleteStatusToString(returnCode));
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppExtendedVaSpace.kt b/src/com/android/settings/applications/AppExtendedVaSpace.kt
new file mode 100644
index 00000000000..a44ca968cd6
--- /dev/null
+++ b/src/com/android/settings/applications/AppExtendedVaSpace.kt
@@ -0,0 +1,58 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswUseExtendedVaSpace
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.android.settings.R
+import com.android.settings.core.BasePreferenceController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterUseExtendedVaSpace : AswAdapter<AswUseExtendedVaSpace>() {
+
+    override fun getAppSwitch() = AswUseExtendedVaSpace.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_ext_va_space)
+
+    override fun getDetailFragmentClass() = AppExtendedVaSpaceFragment::class
+}
+
+@Composable
+fun AppExtendedVaSpacePreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    if (ExtSettingControllerHelper.getDevModeSettingAvailability(context) != BasePreferenceController.AVAILABLE) {
+        return
+    }
+
+    AswPreference(context, app, AswAdapterUseExtendedVaSpace)
+}
+
+class AppExtendedVaSpaceFragment : AswExploitProtectionFragment<AswUseExtendedVaSpace>() {
+
+    override fun getAswAdapter() = AswAdapterUseExtendedVaSpace
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_REQUIRED_BY_HARDENED_MALLOC -> R.string.aep_ext_va_space_ir_hardened_malloc
+            AppSwitch.IR_NON_64_BIT_NATIVE_CODE -> R.string.aep_ext_va_space_ir_32_bit_native_code
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_ext_va_space_footer)
+    }
+}
+
+
+class ExtendedVaSpaceAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterUseExtendedVaSpace) {
+
+    override fun getAvailabilityStatus() = ExtSettingControllerHelper
+        .getDevModeSettingAvailability(mContext)
+}
diff --git a/src/com/android/settings/applications/AppHardenedMalloc.kt b/src/com/android/settings/applications/AppHardenedMalloc.kt
new file mode 100644
index 00000000000..aac49534220
--- /dev/null
+++ b/src/com/android/settings/applications/AppHardenedMalloc.kt
@@ -0,0 +1,54 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswUseHardenedMalloc
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.android.settings.R
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterUseHardenedMalloc : AswAdapter<AswUseHardenedMalloc>() {
+
+    override fun getAppSwitch() = AswUseHardenedMalloc.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_hmalloc)
+
+    override fun getDetailFragmentClass() = AppHardenedMallocFragment::class
+}
+
+@Composable
+fun AppHardenedMallocPreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterUseHardenedMalloc)
+}
+
+class AppHardenedMallocFragment : AswExploitProtectionFragment<AswUseHardenedMalloc>() {
+
+    override fun getAswAdapter() = AswAdapterUseHardenedMalloc
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_IS_SYSTEM_APP -> R.string.aep_hmalloc_ir_preinstalled_app
+            AppSwitch.IR_NO_NATIVE_CODE -> R.string.aep_hmalloc_ir_no_native_code
+            AppSwitch.IR_NON_64_BIT_NATIVE_CODE -> R.string.aep_hmalloc_ir_32_bit_native_code
+            AppSwitch.IR_IS_DEBUGGABLE_APP -> R.string.aep_hmalloc_ir_debuggable_app
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_hmalloc_footer)
+        setLearnMoreLink(fp, "https://grapheneos.org/features#exploit-mitigations")
+    }
+}
+
+
+class HardenedMallocAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterUseHardenedMalloc) {
+
+    override fun getAvailabilityStatus() = AVAILABLE
+}
diff --git a/src/com/android/settings/applications/AppManagePlayIntegrityApi.kt b/src/com/android/settings/applications/AppManagePlayIntegrityApi.kt
new file mode 100644
index 00000000000..788272fcd37
--- /dev/null
+++ b/src/com/android/settings/applications/AppManagePlayIntegrityApi.kt
@@ -0,0 +1,138 @@
+package com.android.settings.applications
+
+import android.app.compat.gms.GmsUtils
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.content.pm.GosPackageStateFlag
+import android.content.pm.PackageManager.NameNotFoundException
+import android.ext.PackageId
+import android.ext.settings.app.AswBlockPlayIntegrityApi
+import android.net.Uri
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.Preference
+import androidx.preference.PreferenceScreen
+import androidx.preference.SwitchPreferenceCompat
+import com.android.settings.R
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.spaprivileged.model.app.userId
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterManagePlayIntegrityApi : AswAdapter<AswBlockPlayIntegrityApi>() {
+    override fun getAppSwitch() = AswBlockPlayIntegrityApi.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.app_play_integrity_api)
+    override fun getOnTitle(ctx: Context) = ctx.getText(R.string.app_play_integrity_api_blocked)
+    override fun getOffTitle(ctx: Context) = ctx.getText(R.string.app_play_integrity_api_not_blocked)
+
+    override fun getDetailFragmentClass() = AppManagePlayIntegrityApiFragment::class
+
+    override fun shouldIncludeInAppListPage(app: ApplicationInfo, gosPs: GosPackageState): Boolean {
+        return gosPs.hasFlag(GosPackageStateFlag.PLAY_INTEGRITY_API_USED_AT_LEAST_ONCE)
+    }
+}
+
+@Composable
+fun AppManagePlayIntegrityApiPreference(app: ApplicationInfo) {
+    if (GosPackageState.get(app.packageName, app.userId)
+            .hasFlag(GosPackageStateFlag.PLAY_INTEGRITY_API_USED_AT_LEAST_ONCE)) {
+        AswPreference(LocalContext.current, app, AswAdapterManagePlayIntegrityApi)
+    }
+}
+
+class AppManagePlayIntegrityApiFragment : AppInfoWithHeader() {
+    private lateinit var showUsageNotifsSwitch: SwitchPreferenceCompat
+    private lateinit var blockUsageAttemptsSwitch: SwitchPreferenceCompat
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        requireActivity().setTitle(R.string.app_play_integrity_api)
+
+        val prefCtx = prefContext
+        val screen: PreferenceScreen = preferenceManager.createPreferenceScreen(prefCtx)
+
+        FooterPreference(prefCtx).apply {
+            setOrder(-100)
+            setTitle(R.string.app_play_integrity_top_intro)
+            screen.addPreference(this)
+        }
+        Preference(prefCtx).apply {
+            setTitle(R.string.app_play_integrity_contact_app_developer)
+            setOnPreferenceClickListener {
+                val pkgName = mPackageName
+                val intent: Intent
+                if (isPlayStoreAvailable()) {
+                    intent = GmsUtils.createAppPlayStoreIntent(pkgName)
+                } else {
+                    val uri = Uri.parse("https://play.google.com/store/apps/details?id=$pkgName")
+                    intent = Intent.createChooser(Intent(Intent.ACTION_VIEW, uri), null)
+                }
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                startActivity(intent)
+                true
+            }
+            screen.addPreference(this)
+        }
+        showUsageNotifsSwitch = SwitchPreferenceCompat(prefCtx).apply {
+            setTitle(R.string.app_play_integrity_show_usage_notifications)
+            setOnPreferenceChangeListener { _, value ->
+                val ed = GosPackageState.edit(mPackageName, mUserId)
+                AswBlockPlayIntegrityApi.I.setNotificationEnabled(ed, value as Boolean)
+                ed.apply()
+            }
+            screen.addPreference(this)
+        }
+        blockUsageAttemptsSwitch = SwitchPreferenceCompat(prefCtx).apply {
+            setTitle(R.string.app_play_integrity_block_usage_attempts)
+            setSummaryOn(R.string.app_play_integrity_block_usage_attempts_summary_on)
+            setOnPreferenceChangeListener { _, value ->
+                val ed = GosPackageState.edit(mPackageName, mUserId)
+                AswBlockPlayIntegrityApi.I.set(ed, value as Boolean)
+                ed.apply()
+            }
+            screen.addPreference(this)
+        }
+        AswAdapterManagePlayIntegrityApi.addAppListPageLink(
+                screen, getText(R.string.app_play_integrity_see_all_apps))
+
+        setPreferenceScreen(screen)
+    }
+
+    override fun refreshUi(): Boolean {
+        val appInfo = getAppInfo(mPackageName) ?: return false
+        val gosPs = GosPackageState.get(mPackageName, mUserId)
+
+        showUsageNotifsSwitch.isChecked = AswBlockPlayIntegrityApi.I.isNotificationEnabled(gosPs)
+
+        blockUsageAttemptsSwitch.isChecked = AswBlockPlayIntegrityApi.I
+                .get(requireContext(), mUserId, appInfo, gosPs)
+
+        return true
+    }
+
+    private fun isPlayStoreAvailable(): Boolean {
+        val appInfo = getAppInfo(PackageId.PLAY_STORE_NAME) ?: return false
+        if (!appInfo.enabled) {
+            return false
+        }
+        return appInfo.ext().packageId == PackageId.PLAY_STORE
+    }
+
+    private fun getAppInfo(pkgName: String): ApplicationInfo? {
+        val pkgManager = requireContext().packageManager
+        try {
+            return pkgManager.getApplicationInfoAsUser(pkgName, 0, mUserId)
+        } catch (e: NameNotFoundException) {
+            return null
+        }
+    }
+
+    override fun createDialog(id: Int, errorCode: Int): AlertDialog? = null
+
+    override fun getMetricsCategory(): Int = METRICS_CATEGORY_UNKNOWN
+}
diff --git a/src/com/android/settings/applications/AppMemoryDynCodeLoading.kt b/src/com/android/settings/applications/AppMemoryDynCodeLoading.kt
new file mode 100644
index 00000000000..92444f2847f
--- /dev/null
+++ b/src/com/android/settings/applications/AppMemoryDynCodeLoading.kt
@@ -0,0 +1,92 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.ExtSettings
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswRestrictMemoryDynCodeLoading
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.BoolSettingFragment
+import com.android.settings.ext.BoolSettingFragmentPrefController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterMemoryDynCodeLoading : AswAdapter<AswRestrictMemoryDynCodeLoading>() {
+
+    override fun getAppSwitch() = AswRestrictMemoryDynCodeLoading.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_memory_dcl)
+    override fun getShortAswTitle(ctx: Context) = ctx.getText(R.string.aep_memory_dcl_short)
+
+    override fun getOnTitle(ctx: Context) = ctx.getText(R.string.aep_restricted)
+    override fun getOffTitle(ctx: Context) = ctx.getText(R.string.aep_allowed)
+
+    override fun getNotificationToggleTitle(ctx: Context) = ctx.getText(R.string.dcl_notif_toggle_title)
+
+    override fun getDetailFragmentClass() = AppMemoryDynCodeLoadingFragment::class
+}
+
+@Composable
+fun AppMemoryDynCodeLoadingPreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterMemoryDynCodeLoading)
+}
+
+class AppMemoryDynCodeLoadingFragment : AswExploitProtectionFragment<AswRestrictMemoryDynCodeLoading>() {
+
+    override fun getAswAdapter() = AswAdapterMemoryDynCodeLoading
+
+    override fun getTitle() = getText(R.string.aep_memory_dcl_short)
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_IS_SYSTEM_APP -> R.string.aep_memory_dcl_dvr_is_system_app
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_memory_dcl_footer)
+    }
+}
+
+class AppDefaultMemoryDynCodeLoadingPrefController(ctx: Context, key: String) :
+        BoolSettingFragmentPrefController(ctx, key,
+            ExtSettings.RESTRICT_MEMORY_DYN_CODE_LOADING_BY_DEFAULT
+        ) {
+
+    override fun getSummaryOn() = resText(R.string.aep_default_summary_restricted)
+    override fun getSummaryOff() = resText(R.string.aep_default_summary_allowed_for_3p_apps)
+}
+
+class AppDefaultMemoryDynCodeLoadingFragment : BoolSettingFragment() {
+
+    override fun getSetting() = ExtSettings.RESTRICT_MEMORY_DYN_CODE_LOADING_BY_DEFAULT
+
+    override fun getTitle() = resText(R.string.aep_memory_dcl_short)
+
+    override fun getMainSwitchTitle() = resText(R.string.aep_default_main_switch_restrict_for_3p_apps)
+
+    override fun addExtraPrefs(screen: PreferenceScreen) {
+        AswAdapterMemoryDynCodeLoading.addAppListPageLink(screen)
+    }
+
+    override fun makeFooterPref(builder: FooterPreference.Builder): FooterPreference {
+        val s = getString(R.string.app_exploit_protection_default_value_warning) + "\n\n" +
+                getString(R.string.aep_memory_dcl_footer) + "\n\n" +
+                getString(R.string.aep_default_dcl_footer_ending)
+        return builder.setTitle(s).build()
+    }
+}
+
+class MemoryDynCodeLoadingAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterMemoryDynCodeLoading) {
+
+    override fun getAvailabilityStatus() = ExtSettingControllerHelper
+        .getSecondaryUserOnlySettingAvailability(mContext)
+}
diff --git a/src/com/android/settings/applications/AppMemoryTagging.kt b/src/com/android/settings/applications/AppMemoryTagging.kt
new file mode 100644
index 00000000000..20ffbe0829e
--- /dev/null
+++ b/src/com/android/settings/applications/AppMemoryTagging.kt
@@ -0,0 +1,111 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.ExtSettings
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswUseMemoryTagging
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.PreferenceScreen
+import com.android.internal.os.Zygote
+import com.android.settings.R
+import com.android.settings.ext.AppPrefUtils
+import com.android.settings.ext.BoolSettingFragment
+import com.android.settings.ext.BoolSettingFragmentPrefController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterUseMemoryTagging : AswAdapter<AswUseMemoryTagging>() {
+
+    override fun getAppSwitch() = AswUseMemoryTagging.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_memtag)
+
+    override fun getNotificationToggleTitle(ctx: Context) = ctx.getText(R.string.aep_memtag_notif_toggle_time)
+
+    override fun getDetailFragmentClass() = AppMemtagFragment::class
+}
+
+private val isMemoryTaggingSupported = Zygote.nativeSupportsMemoryTagging()
+
+@Composable
+fun AppMemtagPreference(app: ApplicationInfo) {
+    if (!isMemoryTaggingSupported) {
+        return
+    }
+
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterUseMemoryTagging)
+}
+
+class AppMemtagFragment : AswExploitProtectionFragment<AswUseMemoryTagging>() {
+
+    override fun getAswAdapter() = AswAdapterUseMemoryTagging
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_IS_SYSTEM_APP -> R.string.aep_memtag_dvr_is_system_app
+            AppSwitch.IR_NO_NATIVE_CODE -> R.string.aep_memtag_dvr_no_native_code
+            AppSwitch.IR_OPTED_IN_VIA_MANIFEST -> R.string.aep_memtag_dvr_manifest_opt_in
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_memtag_footer)
+    }
+}
+
+class AppDefaultMemtagPrefController(ctx: Context, key: String) :
+    BoolSettingFragmentPrefController(ctx, key, ExtSettings.FORCE_APP_MEMTAG_BY_DEFAULT) {
+
+    private val isSupported = Zygote.nativeSupportsMemoryTagging()
+
+    override fun getAvailabilityStatus(): Int {
+        if (!isSupported) {
+            return UNSUPPORTED_ON_DEVICE
+        }
+
+        return super.getAvailabilityStatus()
+    }
+
+    override fun getSummaryOn() = resText(R.string.aep_default_memtag_summary_on)
+    override fun getSummaryOff() = resText(R.string.aep_default_memtag_summary_off)
+}
+
+class AppDefaultMemtagFragment : BoolSettingFragment() {
+
+    override fun getSetting() = ExtSettings.FORCE_APP_MEMTAG_BY_DEFAULT
+
+    override fun getTitle() = resText(R.string.aep_memtag)
+
+    override fun getMainSwitchTitle() = resText(R.string.aep_default_memtag_main_switch_title)
+    override fun getMainSwitchSummary() = resText(R.string.aep_default_memtag_main_switch_summary)
+
+    override fun addExtraPrefs(screen: PreferenceScreen) {
+        AswAdapterUseMemoryTagging.addAppListPageLink(screen)
+    }
+
+    override fun makeFooterPref(builder: FooterPreference.Builder): FooterPreference {
+        val text = AppPrefUtils.getFooterForDefaultHardeningSetting(requireContext(),
+                R.string.aep_default_memtag_footer)
+        return builder.setTitle(text).build()
+    }
+}
+
+class MemtagAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterUseMemoryTagging) {
+
+    private val isSupported = Zygote.nativeSupportsMemoryTagging()
+
+    override fun getAvailabilityStatus(): Int {
+        if (!isSupported) {
+            return UNSUPPORTED_ON_DEVICE
+        }
+        return ExtSettingControllerHelper
+            .getSecondaryUserOnlySettingAvailability(mContext)
+    }
+}
diff --git a/src/com/android/settings/applications/AppNativeDebugging.kt b/src/com/android/settings/applications/AppNativeDebugging.kt
new file mode 100644
index 00000000000..52ab5b94c62
--- /dev/null
+++ b/src/com/android/settings/applications/AppNativeDebugging.kt
@@ -0,0 +1,94 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.BoolSetting
+import android.ext.settings.ExtSettings
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswDenyNativeDebug
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.AppPrefUtils
+import com.android.settings.ext.BoolSettingFragment
+import com.android.settings.ext.BoolSettingFragmentPrefController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterNativeDebugging : AswAdapter<AswDenyNativeDebug>() {
+
+    override fun getAppSwitch() = AswDenyNativeDebug.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_native_debug_title)
+
+    override fun getOnTitle(ctx: Context) = ctx.getText(R.string.aep_blocked)
+    override fun getOffTitle(ctx: Context) = ctx.getText(R.string.aep_allowed)
+
+    override fun getNotificationToggleTitle(ctx: Context) = ctx.getText(R.string.aep_native_debug_notif_toggle_title)
+
+    override fun getDetailFragmentClass() = AppNativeDebuggingFragment::class
+}
+
+@Composable
+fun AppNativeDebuggingPreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterNativeDebugging)
+}
+
+class AppNativeDebuggingFragment : AswExploitProtectionFragment<AswDenyNativeDebug>() {
+
+    override fun getAswAdapter() = AswAdapterNativeDebugging
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_IS_SYSTEM_APP -> R.string.aep_native_debug_dvr_is_system_app
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_native_debug_footer)
+    }
+}
+
+class AppDefaultNativeDebuggingPrefController(ctx: Context, key: String) :
+    BoolSettingFragmentPrefController(ctx, key, ExtSettings.ALLOW_NATIVE_DEBUG_BY_DEFAULT) {
+
+    override fun getSummary(): CharSequence {
+        return resText(if (setting.get(mContext)) R.string.aep_default_summary_allowed_for_3p_apps else R.string.aep_default_summary_blocked)
+    }
+}
+
+class AppDefaultNativeDebuggingFragment : BoolSettingFragment() {
+
+    override fun getSetting(): BoolSetting {
+        invertSetting = true
+        return ExtSettings.ALLOW_NATIVE_DEBUG_BY_DEFAULT
+    }
+
+    override fun getTitle() = getText(R.string.aep_native_debug_title)
+
+    override fun getMainSwitchTitle() = getText(R.string.aep_default_main_switch_block_for_3p_apps)
+
+    override fun addExtraPrefs(screen: PreferenceScreen) {
+        AswAdapterNativeDebugging.addAppListPageLink(screen)
+    }
+
+    override fun makeFooterPref(builder: FooterPreference.Builder): FooterPreference {
+        val text = AppPrefUtils.getFooterForDefaultHardeningSetting(
+            requireContext(),
+            R.string.aep_native_debug_footer
+        )
+        return builder.setTitle(text).build()
+    }
+}
+
+class NativeDebuggingAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterNativeDebugging) {
+
+    override fun getAvailabilityStatus() = ExtSettingControllerHelper
+        .getSecondaryUserOnlySettingAvailability(mContext)
+}
diff --git a/src/com/android/settings/applications/AppStorageDynCodeLoading.kt b/src/com/android/settings/applications/AppStorageDynCodeLoading.kt
new file mode 100644
index 00000000000..04d662ee40f
--- /dev/null
+++ b/src/com/android/settings/applications/AppStorageDynCodeLoading.kt
@@ -0,0 +1,96 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.ExtSettings
+import android.ext.settings.app.AppSwitch
+import android.ext.settings.app.AswRestrictStorageDynCodeLoading
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.BoolSettingFragment
+import com.android.settings.ext.BoolSettingFragmentPrefController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterStorageDynCodeLoading : AswAdapter<AswRestrictStorageDynCodeLoading>() {
+
+    override fun getAppSwitch() = AswRestrictStorageDynCodeLoading.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_storage_dcl)
+    override fun getShortAswTitle(ctx: Context) = ctx.getText(R.string.aep_storage_dcl_short)
+
+    override fun getOnTitle(ctx: Context) = ctx.getText(R.string.aep_restricted)
+    override fun getOffTitle(ctx: Context) = ctx.getText(R.string.aep_allowed)
+
+    override fun getNotificationToggleTitle(ctx: Context) = ctx.getText(R.string.dcl_notif_toggle_title)
+
+    override fun getDetailFragmentClass() = AppStorageDynCodeLoadingFragment::class
+}
+
+@Composable
+fun AppStorageDynCodeLoadingPreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterStorageDynCodeLoading)
+}
+
+class AppStorageDynCodeLoadingFragment : AswExploitProtectionFragment<AswRestrictStorageDynCodeLoading>() {
+
+    override fun getAswAdapter() = AswAdapterStorageDynCodeLoading
+
+    override fun getTitle() = getText(R.string.aep_storage_dcl_short)
+
+    override fun getSummaryForImmutabilityReason(ir: Int): CharSequence? {
+        val id = when (ir) {
+            AppSwitch.IR_IS_SYSTEM_APP -> R.string.aep_storage_dcl_dvr_is_system_app
+            else -> return null
+        }
+        return getText(id)
+    }
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_storage_dcl_footer)
+    }
+}
+
+class AppDefaultStorageDynCodeLoadingPrefController(ctx: Context, key: String) :
+        BoolSettingFragmentPrefController(ctx, key, ExtSettings.RESTRICT_STORAGE_DYN_CODE_LOADING_BY_DEFAULT) {
+
+    override fun getSummaryOn() = run {
+        val id = if (AswRestrictStorageDynCodeLoading.isGmsCoreInstalled(mContext, mContext.userId))
+            R.string.aep_default_summary_restricted_except_for_gmscore_clients
+            else R.string.aep_default_summary_restricted
+        resText(id)
+    }
+
+    override fun getSummaryOff() = resText(R.string.aep_default_summary_allowed_for_3p_apps)
+}
+
+class AppDefaultStorageDynCodeLoadingFragment : BoolSettingFragment() {
+
+    override fun getSetting() = ExtSettings.RESTRICT_STORAGE_DYN_CODE_LOADING_BY_DEFAULT
+
+    override fun getTitle() = resText(R.string.aep_storage_dcl_short)
+
+    override fun getMainSwitchTitle() = resText(R.string.aep_default_main_switch_restrict_for_3p_apps)
+
+    override fun addExtraPrefs(screen: PreferenceScreen) {
+        AswAdapterStorageDynCodeLoading.addAppListPageLink(screen)
+    }
+
+    override fun makeFooterPref(builder: FooterPreference.Builder): FooterPreference {
+        val s = getString(R.string.app_exploit_protection_default_value_warning) + "\n\n" +
+                getString(R.string.aep_storage_dcl_footer) + "\n\n" +
+                getString(R.string.aep_default_dcl_footer_ending)
+        return builder.setTitle(s).build()
+    }
+}
+
+class StorageDynCodeLoadingAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterStorageDynCodeLoading) {
+
+    override fun getAvailabilityStatus() = ExtSettingControllerHelper
+        .getSecondaryUserOnlySettingAvailability(mContext)
+}
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 0f52053b336..a4bec5e69bb 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -207,10 +207,14 @@ void handleClearCacheClick() {
 
     @VisibleForTesting
     void handleClearDataClick() {
+        handleClearDataClick(false);
+    }
+
+    private void handleClearDataClick(boolean ignoreAppActivity) {
         if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
             RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
                     getActivity(), mAppsControlDisallowedAdmin);
-        } else if (mAppEntry.info.manageSpaceActivityName != null) {
+        } else if (!ignoreAppActivity && mAppEntry.info.manageSpaceActivityName != null) {
             if (!Utils.isMonkeyRunning()) {
                 Intent intent = new Intent(Intent.ACTION_DEFAULT);
                 intent.setClassName(mAppEntry.info.packageName,
@@ -296,15 +300,7 @@ private void initDataButtons() {
                 (mAppEntry.info.flags & (FLAG_SYSTEM | FLAG_ALLOW_CLEAR_USER_DATA)) == FLAG_SYSTEM;
         final boolean appRestrictsClearingData = isNonClearableSystemApp || appHasActiveAdmins;
 
-        final Intent intent = new Intent(Intent.ACTION_DEFAULT);
-        if (appHasSpaceManagementUI) {
-            intent.setClassName(mAppEntry.info.packageName, mAppEntry.info.manageSpaceActivityName);
-        }
-        final boolean isManageSpaceActivityAvailable =
-                getPackageManager().resolveActivity(intent, 0) != null;
-
-        if ((!appHasSpaceManagementUI && appRestrictsClearingData)
-                || !isManageSpaceActivityAvailable) {
+        if (appRestrictsClearingData) {
             mButtonsPref
                     .setButton1Text(R.string.clear_user_data_text)
                     .setButton1Icon(R.drawable.ic_settings_delete)
@@ -313,11 +309,25 @@ private void initDataButtons() {
         } else {
             mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
-                    .setButton1OnClickListener(v -> handleClearDataClick());
+                    .setButton1OnClickListener(v -> handleClearDataClick(true));
+        }
+
+        if (appHasSpaceManagementUI) {
+            final Intent intent = new Intent(Intent.ACTION_DEFAULT);
+            intent.setClassName(mAppEntry.info.packageName, mAppEntry.info.manageSpaceActivityName);
+            final boolean isManageSpaceActivityAvailable = getPackageManager().resolveActivity(intent, 0) != null;
+
+            if (isManageSpaceActivityAvailable) {
+                ActionButtonsPreference bp = mButtonsPref;
+                bp.setButton3Text(R.string.manage_storage_text);
+                bp.setButton3Icon(R.drawable.ic_settings_open);
+                bp.setButton3OnClickListener(v -> handleClearDataClick(false));
+            }
         }
 
         if (mAppsControlDisallowedBySystem || AppUtils.isMainlineModule(mPm, mPackageName)) {
             mButtonsPref.setButton1Enabled(false);
+            mButtonsPref.setButton3Enabled(false);
         }
     }
 
@@ -574,7 +584,7 @@ void updateUiWithSize(AppStorageStats result) {
                 mButtonsPref.setButton1Enabled(false);
             } else {
                 mButtonsPref.setButton1Enabled(true)
-                        .setButton1OnClickListener(v -> handleClearDataClick());
+                        .setButton1OnClickListener(v -> handleClearDataClick(true));
             }
             if (cacheSize <= 0 || mCacheCleared) {
                 mButtonsPref.setButton2Enabled(false);
diff --git a/src/com/android/settings/applications/AppWebViewDynCodeLoading.kt b/src/com/android/settings/applications/AppWebViewDynCodeLoading.kt
new file mode 100644
index 00000000000..f1e2894b933
--- /dev/null
+++ b/src/com/android/settings/applications/AppWebViewDynCodeLoading.kt
@@ -0,0 +1,75 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.ExtSettings
+import android.ext.settings.app.AswRestrictWebViewDynCodeLoading
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.BoolSettingFragment
+import com.android.settings.ext.BoolSettingFragmentPrefController
+import com.android.settings.ext.ExtSettingControllerHelper
+import com.android.settings.spa.app.appinfo.AswPreference
+import com.android.settingslib.widget.FooterPreference
+
+object AswAdapterWebViewDynCodeLoading : AswAdapter<AswRestrictWebViewDynCodeLoading>() {
+
+    override fun getAppSwitch() = AswRestrictWebViewDynCodeLoading.I
+
+    override fun getAswTitle(ctx: Context) = ctx.getText(R.string.aep_webview_jit)
+
+    override fun getOnTitle(ctx: Context) = ctx.getText(R.string.aep_disabled)
+    override fun getOffTitle(ctx: Context) = ctx.getText(R.string.aep_enabled)
+
+    override fun getDetailFragmentClass() = AppWebViewDynCodeLoadingFragment::class
+}
+
+@Composable
+fun AppWebViewDynCodeLoadingPreference(app: ApplicationInfo) {
+    val context = LocalContext.current
+    AswPreference(context, app, AswAdapterWebViewDynCodeLoading)
+}
+
+class AppWebViewDynCodeLoadingFragment : AswExploitProtectionFragment<AswRestrictWebViewDynCodeLoading>() {
+
+    override fun getAswAdapter() = AswAdapterWebViewDynCodeLoading
+
+    override fun getTitle() = getText(R.string.aep_webview_jit)
+
+    override fun updateFooter(fp: FooterPreference) {
+        fp.setTitle(R.string.aep_webview_jit_footer)
+    }
+}
+
+class AppDefaultWebViewDynCodeLoadingPrefController(ctx: Context, key: String) :
+        BoolSettingFragmentPrefController(ctx, key, ExtSettings.RESTRICT_WEBVIEW_DYN_CODE_LOADING_BY_DEFAULT) {
+
+    override fun getSummaryOn() = resText(R.string.aep_default_summary_disabled)
+    override fun getSummaryOff() = resText(R.string.aep_default_summary_enabled_for_3p_apps)
+}
+
+class AppDefaultWebViewDynCodeLoadingFragment : BoolSettingFragment() {
+
+    override fun getSetting() = ExtSettings.RESTRICT_WEBVIEW_DYN_CODE_LOADING_BY_DEFAULT
+
+    override fun getTitle() = resText(R.string.aep_webview_jit)
+
+    override fun getMainSwitchTitle() = resText(R.string.aep_default_main_switch_disable_for_3p_apps)
+
+    override fun addExtraPrefs(screen: PreferenceScreen) {
+        AswAdapterWebViewDynCodeLoading.addAppListPageLink(screen)
+    }
+
+    override fun makeFooterPref(builder: FooterPreference.Builder): FooterPreference {
+        return builder.setTitle(R.string.aep_webview_jit_footer).build()
+    }
+}
+
+class WebViewDynCodeLoadingAppListPrefController(context: Context, preferenceKey: String) :
+    AswAppListPrefController(context, preferenceKey, AswAdapterWebViewDynCodeLoading) {
+
+    override fun getAvailabilityStatus() = ExtSettingControllerHelper
+        .getSecondaryUserOnlySettingAvailability(mContext)
+}
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 62c5910904a..c078f951269 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -22,12 +22,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.content.pm.UserInfo;
+import android.ext.PackageId;
 import android.location.LocationManager;
 import android.os.RemoteException;
 import android.os.SystemConfigManager;
@@ -201,6 +203,42 @@ private Set<String> getEnabledPackageAllowlist() {
         if (mPm.getWellbeingPackageName() != null) {
             keepEnabledPackages.add(mPm.getWellbeingPackageName());
         }
+
+        ArraySet<String> systemPkgs = new ArraySet<>(new String[] {
+                // Bundled keyboard, needed for text input in Direct Boot mode if the selected 3rd
+                // party keyboard doesn't support it
+                "com.android.inputmethod.latin",
+
+                // Replacing WebView is not supported
+                "app.vanadium.webview",
+
+                // Only bundled camera can handle some of camera intents
+                "app.grapheneos.camera",
+
+                // Disabling GmsCompat app breaks the GmsCompat layer
+                com.android.internal.gmscompat.GmsCompatApp.PKG_NAME,
+
+                // EuiccSupportPixel handles firmware updates of embedded secure element that is
+                // used for eSIM, NFC, Felica etc
+                PackageId.EUICC_SUPPORT_PIXEL_NAME,
+
+                // CameraX extensions break when it's disabled, which breaks apps that use the
+                // CameraX library
+                PackageId.PIXEL_CAMERA_SERVICES_NAME,
+
+                // Emergency calls break when it's disabled, system dialer app is required for it.
+                "com.android.dialer",
+        });
+
+        PackageManager pm = mContext.getPackageManager();
+
+        for (ApplicationInfo ai : pm.getInstalledApplications(PackageManager.MATCH_SYSTEM_ONLY)) {
+            String pkgName = ai.packageName;
+            if (systemPkgs.contains(pkgName)) {
+                keepEnabledPackages.add(pkgName);
+            }
+        }
+
         return keepEnabledPackages;
     }
 
diff --git a/src/com/android/settings/applications/AswAdapter.kt b/src/com/android/settings/applications/AswAdapter.kt
new file mode 100644
index 00000000000..478dd02e25e
--- /dev/null
+++ b/src/com/android/settings/applications/AswAdapter.kt
@@ -0,0 +1,88 @@
+package com.android.settings.applications
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.ext.settings.app.AppSwitch
+import androidx.preference.Preference
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.SettingsPreferenceFragment
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment
+import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
+import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
+import com.android.settings.spa.app.appinfo.AswAppListPageProvider
+import com.android.settingslib.spaprivileged.model.app.userId
+import kotlin.reflect.KClass
+
+abstract class AswAdapter<T : AppSwitch> {
+    abstract fun getAppSwitch(): T
+
+    enum class Category {
+        ExploitProtection,
+    }
+
+    fun getCategory(): Category = Category.ExploitProtection
+
+    fun getPreferenceSummary(ctx: Context, appInfo: ApplicationInfo): CharSequence {
+        val asw = getAppSwitch()
+        val si = AppSwitch.StateInfo()
+        val userId = appInfo.userId
+        val isOn = asw.get(ctx, userId, appInfo, GosPackageState.get(appInfo.packageName, userId), si)
+        return if (si.isUsingDefaultValue) {
+            getDefaultTitle(ctx, isOn)
+        } else {
+            if (isOn) getOnTitle(ctx) else getOffTitle(ctx)
+        }
+    }
+
+    open fun getNotificationToggleTitle(ctx: Context): CharSequence? = null
+    open fun getNotificationToggleSummary(ctx: Context): CharSequence? = null
+
+    abstract fun getAswTitle(ctx: Context): CharSequence
+
+    open fun getShortAswTitle(ctx: Context) = getAswTitle(ctx)
+
+    fun getDefaultTitle(ctx: Context, isOn: Boolean): CharSequence {
+        return ctx.getString(R.string.aep_default,
+            if (isOn) getOnTitle(ctx) else getOffTitle(ctx)
+        )
+    }
+
+    open fun getOnTitle(ctx: Context): CharSequence = ctx.getText(R.string.aep_enabled)
+
+    open fun getOffTitle(ctx: Context): CharSequence = ctx.getText(R.string.aep_disabled)
+
+    abstract fun getDetailFragmentClass(): KClass<out SettingsPreferenceFragment>
+
+    fun openAppPage(context: Context, app: ApplicationInfo) {
+        AppInfoDashboardFragment.startAppInfoFragment(
+            getDetailFragmentClass().java,
+            app, context, AppInfoSettingsProvider.METRICS_CATEGORY,
+        )
+    }
+
+    fun makeAppListPageProvider() = AswAppListPageProvider(this)
+
+    fun getAppListPageProviderName() = this::class.simpleName!!
+
+    open fun shouldIncludeInAppListPage(app: ApplicationInfo, gosPs: GosPackageState) = true
+
+    fun openAppListPage(ctx: Context) {
+        ctx.startSpaActivity(getAppListPageProviderName())
+    }
+
+    @JvmOverloads
+    fun addAppListPageLink(screen: PreferenceScreen,
+                           title: CharSequence = screen.context.getText(R.string.default_see_all_apps_title)) {
+        val ctx = screen.context
+        val pref = Preference(ctx).apply {
+            this.title = title
+            setOnPreferenceClickListener { p ->
+                p.context.startSpaActivity(getAppListPageProviderName())
+                true
+            }
+        }
+        screen.addPreference(pref)
+    }
+}
diff --git a/src/com/android/settings/applications/AswAppInfoFragment.java b/src/com/android/settings/applications/AswAppInfoFragment.java
new file mode 100644
index 00000000000..cac5229f781
--- /dev/null
+++ b/src/com/android/settings/applications/AswAppInfoFragment.java
@@ -0,0 +1,228 @@
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.GosPackageState;
+import android.ext.settings.app.AppSwitch;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.applications.appinfo.RadioButtonAppInfoFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AswAppInfoFragment<T extends AppSwitch>
+        extends RadioButtonAppInfoFragment {
+
+    protected static final int ID_DEFAULT = 0;
+    protected static final int ID_ON = 1;
+    protected static final int ID_OFF = 2;
+
+    public abstract AswAdapter<T> getAswAdapter();
+
+    protected AswAdapter<T> adapter;
+    private final ArrayList<PrefModel> extraPrefs = new ArrayList<>();
+    @Nullable
+    private TogglePrefModel notifTogglePref;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        adapter = getAswAdapter();
+        super.onCreate(savedInstanceState);
+
+        if (adapter.getAppSwitch().hasNotification()) {
+            Context ctx = requireContext();
+            var p = new TogglePrefModel();
+            p.title = adapter.getNotificationToggleTitle(ctx);
+            p.summary = adapter.getNotificationToggleSummary(ctx);
+            p.onChangeListener = (pref, state) -> {
+                var ed = GosPackageState.edit(mPackageName, mUserId);
+                adapter.getAppSwitch().setNotificationEnabled(ed, (boolean) state);
+                return ed.apply();
+            };
+            extraPrefs.add(p);
+            notifTogglePref = p;
+        }
+        {
+            var p = new LinkPrefModel();
+            p.title = getText(R.string.default_see_all_apps_title);
+            p.onClick = () -> adapter.openAppListPage(requireContext());
+            extraPrefs.add(p);
+        }
+    }
+
+    @Override
+    protected CharSequence getTitle() {
+        return adapter.getAswTitle(requireContext());
+    }
+
+    @Override
+    public Entry[] getEntries() {
+        Context ctx = requireContext();
+        AppSwitch asw = adapter.getAppSwitch();
+
+        int userId = mUserId;
+        GosPackageState ps = GosPackageState.get(mPackageName, userId);
+        ApplicationInfo appInfo = getAppInfo();
+        var si = new AppSwitch.StateInfo();
+        boolean state = asw.get(ctx, userId, appInfo, ps, si);
+
+        boolean isDefault = si.isUsingDefaultValue();
+        boolean isImmutable = si.isImmutable();
+
+        var defaultSi = new AppSwitch.StateInfo();
+        boolean defaultValue = asw.getDefaultValue(ctx, userId, appInfo, ps, defaultSi);
+
+        var def = createEntry(ID_DEFAULT, adapter.getDefaultTitle(ctx, defaultValue));
+        def.isChecked = isDefault;
+        def.isEnabled = !isImmutable;
+        if (def.isEnabled) {
+            int dvr = defaultSi.getDefaultValueReason();
+            CharSequence summary = getSummaryForDefaultValueReason(dvr);
+            if (summary == null) {
+                summary = switch (dvr) {
+                    case AppSwitch.DVR_DEFAULT_SETTING -> {
+                        if (!ctx.getUser().isSystem()) {
+                            yield null;
+                        }
+                        yield getString(R.string.aep_dvr_default_security_setting,
+                                getAppDefaultSettingPathForCategory(adapter.getCategory()));
+                    }
+                    case AppSwitch.DVR_APP_COMPAT_CONFIG_HARDENING_OPT_IN ->
+                        getText(R.string.aep_dvr_compat_config_hardening_opt_in);
+                    case AppSwitch.DVR_APP_COMPAT_CONFIG_HARDENING_OPT_OUT -> {
+                        if (!ctx.getUser().isSystem()) {
+                            yield null;
+                        }
+                        var s = defaultValue ? adapter.getOnTitle(ctx) : adapter.getOffTitle(ctx);
+                        yield getString(R.string.aep_dvr_compat_config_hardening_opt_out,
+                                s.toString(), getSettingPath(R.string.safety_center_title,
+                                                  R.string.more_security_privacy_settings));
+                    }
+                    case AppSwitch.DVR_APP_IS_CLIENT_OF_GMSCORE -> {
+                        var s = defaultValue ? adapter.getOnTitle(ctx) : adapter.getOffTitle(ctx);
+                        yield getString(R.string.aep_dvr_app_is_client_of_gmscore, s.toString());
+                    }
+                    default -> null;
+                };
+            }
+            def.summary = summary;
+        }
+
+        var enabled = createEntry(ID_ON, adapter.getOnTitle(ctx));
+        enabled.isChecked = !isDefault && state;
+        enabled.isEnabled = enabled.isChecked || !isImmutable;
+
+        var disabled = createEntry(ID_OFF, adapter.getOffTitle(ctx));
+        disabled.isChecked = !isDefault && !state;
+        disabled.isEnabled = disabled.isChecked || !isImmutable;
+
+        if (isImmutable) {
+            int immutabilityReason = si.getImmutabilityReason();
+            CharSequence summary = getSummaryForImmutabilityReason(immutabilityReason);
+            if (summary == null) {
+                if (immutabilityReason == AppSwitch.IR_EXPLOIT_PROTECTION_COMPAT_MODE) {
+                    summary = getString(R.string.aep_ir_exploit_protection_compat_mode,
+                            getString(R.string.aep_compat_mode_title));
+                }
+            }
+            if (enabled.isChecked) {
+                enabled.summary = summary;
+            }
+            if (disabled.isChecked) {
+                disabled.summary = summary;
+            }
+        }
+
+        if (notifTogglePref != null) {
+            notifTogglePref.isChecked = adapter.getAppSwitch().isNotificationEnabled(ps);
+            notifTogglePref.isEnabled = state;
+        }
+
+        return new Entry[] { def, enabled, disabled };
+    }
+
+    private String getAppDefaultSettingPathForCategory(AswAdapter.Category category) {
+        switch (category) {
+            case ExploitProtection:
+                return getSettingPath(R.string.safety_center_title, R.string.exploit_protection_settings);
+            default:
+                throw new IllegalArgumentException(category.toString());
+        }
+    }
+
+    private String getSettingPath(int... parts) {
+        var sb = new StringBuilder();
+        for (int i = 0; i < parts.length; ++i) {
+            if (i != 0) {
+                sb.append(" > ");
+            }
+            sb.append(getString(parts[i]));
+        }
+        return sb.toString();
+    }
+
+    @Nullable
+    protected CharSequence getSummaryForDefaultValueReason(int dvr) {
+        return null;
+    }
+
+    @Nullable
+    protected CharSequence getSummaryForImmutabilityReason(int ir) {
+        return null;
+    }
+
+    @Override
+    protected List<PrefModel> getExtraPrefModels() {
+        return extraPrefs;
+    }
+
+    @Override
+    public final void onEntrySelected(int id) {
+        Context ctx = requireContext();
+        AppSwitch asw = adapter.getAppSwitch();
+        int userId = mUserId;
+        String pkgName = mPackageName;
+        GosPackageState ps = GosPackageState.get(pkgName, userId);
+        ApplicationInfo appInfo = getAppInfo();
+
+        boolean isImmutable = asw.isImmutable(ctx, userId, appInfo, ps);
+
+        if (isImmutable) {
+            return;
+        }
+
+        Runnable r = () -> {
+            GosPackageState.Editor ed = GosPackageState.edit(pkgName, userId);
+
+            switch (id) {
+                case ID_DEFAULT -> asw.setUseDefaultValue(ed);
+                case ID_ON, ID_OFF -> asw.set(ed, id == ID_ON);
+                default -> throw new IllegalStateException();
+            }
+
+            ed.setKillUidAfterApply(shouldKillUidAfterChange());
+
+            if (!ed.apply()) {
+                finish();
+            }
+
+            if (!refreshUi()) {
+                setIntentAndFinish(true);
+            }
+        };
+
+        completeStateChange(id, asw.get(ctx, userId, appInfo, ps), r);
+    }
+
+    protected void completeStateChange(int newEntryId, boolean curValue, Runnable stateChangeAction) {
+        stateChangeAction.run();
+    }
+
+    protected boolean shouldKillUidAfterChange() {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/applications/AswAppListPrefController.java b/src/com/android/settings/applications/AswAppListPrefController.java
new file mode 100644
index 00000000000..c6d9fa7260a
--- /dev/null
+++ b/src/com/android/settings/applications/AswAppListPrefController.java
@@ -0,0 +1,27 @@
+package com.android.settings.applications;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+
+import com.android.settings.applications.AswAdapter;
+import com.android.settings.core.BasePreferenceController;
+
+public abstract class AswAppListPrefController extends BasePreferenceController {
+
+    protected final AswAdapter aswAdapter;
+
+    public AswAppListPrefController(Context context, String preferenceKey, AswAdapter adapter) {
+        super(context, preferenceKey);
+        aswAdapter = adapter;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!getPreferenceKey().equals(preference.getKey())) {
+            return false;
+        }
+        aswAdapter.openAppListPage(preference.getContext());
+        return true;
+    }
+}
diff --git a/src/com/android/settings/applications/AswExploitProtectionFragment.java b/src/com/android/settings/applications/AswExploitProtectionFragment.java
new file mode 100644
index 00000000000..19d0a470433
--- /dev/null
+++ b/src/com/android/settings/applications/AswExploitProtectionFragment.java
@@ -0,0 +1,44 @@
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.GosPackageState;
+import android.ext.settings.app.AppSwitch;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+
+public abstract class AswExploitProtectionFragment<T extends AppSwitch> extends AswAppInfoFragment<T> {
+
+    @Override
+    protected void completeStateChange(int newEntryId, boolean curValue, Runnable stateChangeAction) {
+        Context ctx = requireContext();
+
+        boolean showWarning = false;
+        if (curValue) {
+            if (newEntryId == ID_OFF) {
+                showWarning = true;
+            } else if (newEntryId == ID_DEFAULT) {
+                AppSwitch asw = adapter.getAppSwitch();
+                int userId = mUserId;
+                var ps = GosPackageState.get(mPackageName, userId);
+                showWarning = !asw.getDefaultValue(ctx, userId, getAppInfo(), ps);
+            }
+        }
+        if (showWarning) {
+            var d = getExploitProtectionWarningOnDisable(ctx, stateChangeAction);
+            d.show();
+        } else {
+            stateChangeAction.run();
+        }
+    }
+
+    public static AlertDialog.Builder getExploitProtectionWarningOnDisable(Context ctx, Runnable action) {
+        var b = new AlertDialog.Builder(ctx);
+        b.setTitle(R.string.aep_confirm_disable_title);
+        b.setMessage(R.string.aep_confirm_disable_warning_msg);
+        b.setNegativeButton(R.string.cancel, null);
+        b.setPositiveButton(R.string.aep_confirm_disable_proceed_btn, (d, w) -> action.run());
+        return b;
+    }
+}
diff --git a/src/com/android/settings/applications/GmsCompatAppController.java b/src/com/android/settings/applications/GmsCompatAppController.java
new file mode 100644
index 00000000000..4b978a66287
--- /dev/null
+++ b/src/com/android/settings/applications/GmsCompatAppController.java
@@ -0,0 +1,65 @@
+package com.android.settings.applications;
+
+import android.annotation.Nullable;
+import android.app.compat.gms.GmsCompat;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.preference.Preference;
+
+import com.android.internal.gmscompat.GmsCompatApp;
+import com.android.internal.gmscompat.GmsInfo;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+public class GmsCompatAppController extends BasePreferenceController {
+
+    public GmsCompatAppController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Nullable
+    private UserHandle getUser() {
+        if ("sandboxed_google_play_private_space".equals(getPreferenceKey())) {
+            return PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle();
+        }
+
+        UserHandle workProfileUser = getWorkProfileUser();
+        if (workProfileUser != null) {
+            return workProfileUser;
+        }
+
+        return mContext.getUser();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        UserHandle user = getUser();
+        if (user == null) {
+            return DISABLED_FOR_USER;
+        }
+
+        return GmsCompat.isEnabledFor(GmsInfo.PACKAGE_GMS_CORE, user.getIdentifier()) ?
+                AVAILABLE : DISABLED_FOR_USER;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        UserHandle user = getUser();
+        if (user == null) {
+            throw new IllegalStateException("getUser() returned null, key: " + getPreferenceKey());
+        }
+
+        Intent intent = new Intent(GmsCompatApp.PKG_NAME + ".SETTINGS_LINK");
+        intent.setPackage(GmsCompatApp.PKG_NAME);
+        mContext.startActivityAsUser(intent, user);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index cbc5a7b6100..b6a7473df08 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -157,9 +157,9 @@ protected AlertDialog createDialog(int id, int errorCode) {
     }
 
     private void launchApplication() {
-        Intent launchIntent = mPm.getLaunchIntentForPackage(mPackageName)
-                .addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+        Intent launchIntent = mPm.getLaunchIntentForPackage(mPackageName);
         if (launchIntent != null) {
+            launchIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
             getContext().startActivityAsUser(launchIntent, new UserHandle(mUserId));
         }
     }
diff --git a/src/com/android/settings/applications/appinfo/RadioButtonAppInfoFragment.java b/src/com/android/settings/applications/appinfo/RadioButtonAppInfoFragment.java
new file mode 100644
index 00000000000..26fa78beb4d
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/RadioButtonAppInfoFragment.java
@@ -0,0 +1,228 @@
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.TypedValue;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.applications.SpacePreference;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import java.util.Collections;
+import java.util.List;
+
+public abstract class RadioButtonAppInfoFragment extends AppInfoWithHeader implements SelectorWithWidgetPreference.OnClickListener {
+
+    public static class Entry {
+        public final int id;
+        public CharSequence title;
+        @Nullable
+        public CharSequence summary;
+        public boolean isChecked;
+        public boolean isEnabled;
+
+        public Entry(int id, CharSequence title, @Nullable CharSequence summary, boolean isChecked, boolean isEnabled) {
+            this.id = id;
+            this.title = title;
+            this.summary = summary;
+            this.isChecked = isChecked;
+            this.isEnabled = isEnabled;
+        }
+    }
+
+    public static Entry createEntry(int id, CharSequence title) {
+        return new Entry(id, title, null, false, true);
+    }
+
+    public Entry createEntry(int id, @StringRes int title) {
+        return createEntry(id, getText(title));
+    }
+
+    public Entry createEntry(@StringRes int title) {
+        return createEntry(title, title);
+    }
+
+    public abstract Entry[] getEntries();
+
+    public boolean hasFooter() {
+        return true;
+    }
+
+    public abstract void updateFooter(FooterPreference fp);
+
+    public void setLearnMoreLink(FooterPreference p, String url) {
+        p.setLearnMoreAction(v -> {
+            var i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            startActivity(i);
+        });
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(getPrefContext());
+        setPreferenceScreen(screen);
+        requireActivity().setTitle(getTitle());
+    }
+
+    protected abstract CharSequence getTitle();
+
+    @Nullable
+    private SelectorWithWidgetPreference[] radioButtons;
+    @Nullable
+    private FooterPreference footer;
+
+    private Preference[] extraPrefs;
+
+    @Override
+    protected boolean refreshUi() {
+        Entry[] entries = getEntries();
+        int entryCnt = entries.length;
+
+        Context ctx = getPrefContext();
+        PreferenceScreen screen = getPreferenceScreen();
+
+        if (radioButtons == null || radioButtons.length != entryCnt) {
+            if (radioButtons != null) {
+                for (Preference p : radioButtons) {
+                    screen.removePreference(p);
+                }
+            }
+
+            radioButtons = new SelectorWithWidgetPreference[entryCnt];
+
+            for (int i = 0; i < entryCnt; ++i) {
+                var p = new SelectorWithWidgetPreference(ctx);
+                p.setOnClickListener(this);
+                screen.addPreference(p);
+                radioButtons[i] = p;
+            }
+        }
+
+        for (int i = 0; i < entryCnt; ++i) {
+            SelectorWithWidgetPreference p = radioButtons[i];
+            Entry e = entries[i];
+            p.setKey(Integer.toString(e.id));
+            p.setTitle(e.title);
+            p.setSummary(e.summary);
+            p.setEnabled(e.isEnabled);
+            p.setChecked(e.isChecked);
+        }
+
+        List<PrefModel> extraPrefModels = getExtraPrefModels();
+
+        if (extraPrefs == null) {
+            if (extraPrefModels.isEmpty()) {
+                extraPrefs = new Preference[0];
+            } else {
+                var spacer = new SpacePreference(ctx, null);
+                int h = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 48f, ctx.getResources().getDisplayMetrics());
+                spacer.setHeight(h);
+                screen.addPreference(spacer);
+
+                extraPrefs = new Preference[extraPrefModels.size()];
+                for (int i = 0; i < extraPrefs.length; ++i) {
+                    PrefModel pm = extraPrefModels.get(i);
+                    Preference p;
+                    if (pm instanceof LinkPrefModel lpm) {
+                        p = new Preference(ctx);
+                        p.setOnPreferenceClickListener(pref -> {
+                            lpm.onClick.run();
+                            return true;
+                        });
+                    } else if (pm instanceof TogglePrefModel tpm) {
+                        p = new SwitchPreferenceCompat(ctx);
+                        p.setOnPreferenceChangeListener(tpm.onChangeListener);
+                    } else {
+                        throw new IllegalArgumentException(pm.toString());
+                    }
+                    p.setKey("extra_pref_" + i);
+                    screen.addPreference(p);
+                    extraPrefs[i] = p;
+                }
+            }
+        }
+        for (int i = 0; i < extraPrefs.length; ++i) {
+            PrefModel pm = extraPrefModels.get(i);
+            Preference p = extraPrefs[i];
+            if (pm instanceof TogglePrefModel tpm) {
+                var sp = (SwitchPreferenceCompat) p;
+                sp.setChecked(tpm.isChecked);
+            }
+            p.setTitle(pm.title);
+            p.setSummary(pm.summary);
+            p.setEnabled(pm.isEnabled);
+        }
+
+        if (hasFooter()) {
+            if (footer == null) {
+                footer = new FooterPreference(ctx);
+                screen.addPreference(footer);
+            }
+            updateFooter(footer);
+        } else {
+            if (footer != null) {
+                screen.removePreference(footer);
+                footer = null;
+            }
+        }
+
+        return true;
+    }
+
+    public static class PrefModel {
+        public CharSequence title;
+        public CharSequence summary;
+        public boolean isEnabled = true;
+    }
+
+    public static class LinkPrefModel extends PrefModel {
+        public Runnable onClick;
+    }
+
+    public static class TogglePrefModel extends PrefModel {
+        public boolean isChecked;
+        public Preference.OnPreferenceChangeListener onChangeListener;
+    }
+
+    protected List<PrefModel> getExtraPrefModels() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public final void onRadioButtonClicked(SelectorWithWidgetPreference emiter) {
+        int id = Integer.parseInt(emiter.getKey());
+        onEntrySelected(id);
+        if (!refreshUi()) {
+            setIntentAndFinish(true);
+        }
+    }
+
+    public abstract void onEntrySelected(int id);
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return METRICS_CATEGORY_UNKNOWN;
+    }
+
+    protected ApplicationInfo getAppInfo() {
+        return mPackageInfo.applicationInfo;
+    }
+}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 9e1cb8d067c..c5f3cd9dd58 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -880,9 +880,11 @@ void updateOptionsMenu() {
         }
         mOptionsMenu.findItem(R.id.advanced).setVisible(false);
 
-        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
+        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(
+                (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
                 && mSortOrder != R.id.sort_order_alpha);
-        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
+        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(
+                (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
                 && mSortOrder != R.id.sort_order_size);
 
         mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
diff --git a/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessFragment.java b/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessFragment.java
new file mode 100644
index 00000000000..d681703f4cd
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessFragment.java
@@ -0,0 +1,46 @@
+package com.android.settings.applications.specialaccess;
+
+import android.app.ActivityThread;
+import android.ext.settings.BoolSetting;
+import android.ext.settings.ExtSettings;
+import android.os.RemoteException;
+
+import com.android.internal.util.GoogleCameraUtils;
+import com.android.settings.R;
+import com.android.settings.ext.BoolSettingFragment;
+import com.android.settingslib.widget.FooterPreference;
+
+public class GoogleSpecialAcceleratorAccessFragment extends BoolSettingFragment {
+    private static final String TAG = GoogleSpecialAcceleratorAccessFragment.class.getSimpleName();
+
+    @Override
+    protected BoolSetting getSetting() {
+        return ExtSettings.ALLOW_GOOGLE_APPS_SPECIAL_ACCESS_TO_ACCELERATORS;
+    }
+
+    @Override
+    protected CharSequence getTitle() {
+        return resText(R.string.Google_apps_special_accelerator_access_title);
+    }
+
+    @Override
+    protected CharSequence getMainSwitchTitle() {
+        return resText(R.string.Google_apps_special_accelerator_access_main_switch);
+    }
+
+    @Override
+    protected void onMainSwitchChanged(boolean state) {
+        if (GoogleCameraUtils.isCustomSeInfoNeededForAccessToAccelerators(requireContext())) {
+            try {
+                ActivityThread.getPackageManager().updateSeInfo(GoogleCameraUtils.PACKAGE_NAME);
+            } catch (RemoteException e) {
+                throw e.rethrowFromSystemServer();
+            }
+        }
+    }
+
+    @Override
+    protected FooterPreference makeFooterPref(FooterPreference.Builder builder) {
+        return builder.setTitle(R.string.Google_apps_special_accelerator_access_footer).build();
+    }
+}
diff --git a/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessPrefController.java b/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessPrefController.java
new file mode 100644
index 00000000000..ac7d84fcbb0
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/GoogleSpecialAcceleratorAccessPrefController.java
@@ -0,0 +1,34 @@
+package com.android.settings.applications.specialaccess;
+
+import android.content.Context;
+import android.ext.settings.ExtSettings;
+
+import com.android.settings.R;
+import com.android.settings.ext.BoolSettingFragmentPrefController;
+
+public class GoogleSpecialAcceleratorAccessPrefController extends BoolSettingFragmentPrefController {
+
+    public GoogleSpecialAcceleratorAccessPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.ALLOW_GOOGLE_APPS_SPECIAL_ACCESS_TO_ACCELERATORS);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_Google_apps_can_have_special_access_to_accelerators)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        return super.getAvailabilityStatus();
+    }
+
+    @Override
+    protected CharSequence getSummaryOn() {
+        return resText(R.string.Google_apps_special_accelerator_access_summary_granted);
+    }
+
+    @Override
+    protected CharSequence getSummaryOff() {
+        return resText(R.string.Google_apps_special_accelerator_access_summary_not_granted);
+    }
+}
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index ef338768304..e53b6e45cf0 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -742,6 +742,7 @@ void updateInterface() {
                     () -> getString(R.string.add_device_admin_msg)));
             mActionButton.setText(mDPM.getResources().getString(ACTIVATE_THIS_DEVICE_ADMIN_APP,
                     () -> getString(R.string.add_device_admin)));
+            delayActivationButton(mActionButton);
             if (isAdminUninstallable()) {
                 mUninstallButton.setVisibility(View.VISIBLE);
             }
@@ -780,6 +781,19 @@ private void addDeviceAdminPolicies(boolean showDescription) {
         }
     }
 
+    private void delayActivationButton(Button button) {
+        button.setEnabled(false);
+        button.setAlpha(0.5f);
+        Runnable action = new Runnable() {
+            @Override
+            public void run() {
+                button.setEnabled(true);
+                button.setAlpha(1f);
+            }
+        };
+        button.postDelayed(action, 1000);
+    }
+
     /**
      * Utility to retrieve a view displaying a single permission.  This provides
      * the UI layout for permissions.
diff --git a/src/com/android/settings/biometrics/fingerprint/BiometricSecondFactorPinPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/BiometricSecondFactorPinPreferenceController.java
new file mode 100644
index 00000000000..5f7cf8dcdc2
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint/BiometricSecondFactorPinPreferenceController.java
@@ -0,0 +1,154 @@
+package com.android.settings.biometrics.fingerprint;
+
+import static com.android.internal.widget.LockDomain.Secondary;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserManager;
+import android.text.TextUtils;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseBiometricSecondFactorPin;
+import com.android.settings.security.screenlock.BiometricSecondFactorPinSettings;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+
+/**
+ * Controller for the biometric second factor PIN preference. If the user does not have a second
+ * factor PIN set, launches an Activity for creating one, otherwise launches the settings for the
+ * second factor PIN.
+ */
+public class BiometricSecondFactorPinPreferenceController extends BasePreferenceController {
+
+    private final LockPatternUtils mLockPatternUtils;
+    private final UserManager mUserManager;
+
+    protected final Fragment mHost;
+
+    private int mUserId = -1;
+    private LockscreenCredential mPrimaryCredential;
+
+    private int mSettingsRequestCode;
+    private int mChooseRequestCode;
+
+    public BiometricSecondFactorPinPreferenceController(Context context, Fragment host, String key) {
+        super(context, key);
+
+        mHost = host;
+        mUserManager = context.getSystemService(UserManager.class);
+        mLockPatternUtils = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(context);
+
+    }
+
+    public void setUserId(int userId) {
+        mUserId = userId;
+    }
+    public void setPrimaryCredential(LockscreenCredential primaryCredential) {
+        mPrimaryCredential = primaryCredential;
+    }
+
+    public void setSettingsRequestCode(int value) {
+        mSettingsRequestCode = value;
+    }
+
+    public void setChooseRequestCode(int value) {
+        mChooseRequestCode = value;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.FINGERPRINT;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (!isAvailable()) {
+            return null;
+        }
+
+        if (mLockPatternUtils.isSecure(mUserId, Secondary)) {
+            return mContext.getResources().getString(
+                    R.string.biometric_second_factor_pin_empty_summary);
+        }
+        return mContext.getResources().getString(
+                R.string.biometric_second_factor_pin_setup_summary);
+
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return super.handlePreferenceTreeClick(preference);
+        }
+
+        if (mLockPatternUtils.isSecure(mUserId, Secondary)) {
+            launchSettings();
+        } else {
+            launchChoose();
+        }
+
+        return true;
+    }
+
+    public void launchSettings() {
+        mHost.startActivityForResult(getSettingsIntent(), mSettingsRequestCode);
+    }
+
+    private Intent getSettingsIntent() {
+        BiometricSecondFactorPinSettings.IntentBuilder builder =
+                new BiometricSecondFactorPinSettings.IntentBuilder(mContext)
+                        .setSourceMetricsCateogry(getMetricsCategory())
+                        .setUserId(mUserId)
+                        .setPrimaryCredential(mPrimaryCredential);
+
+        return builder.build();
+    }
+
+    private void launchChoose() {
+        mHost.startActivityForResult(getChooseIntent(), mChooseRequestCode);
+    }
+
+    private Intent getChooseIntent() {
+        ChooseBiometricSecondFactorPin.IntentBuilder builder =
+                new ChooseBiometricSecondFactorPin.IntentBuilder(mContext)
+                        .setUserId(mUserId)
+                        .setPrimaryCredential(mPrimaryCredential);
+
+        return builder.build();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!mLockPatternUtils.checkUserSupportsBiometricSecondFactor(mUserId, false)) {
+            return DISABLED_FOR_USER;
+        }
+
+        if (!FingerprintSettingsKeyguardUnlockPreferenceController.isChecked(mContext, mUserId)) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        return FingerprintSettingsKeyguardUnlockPreferenceController.getAvailabilityStatus(mContext, mUserManager, getRestrictingAdmin(), mUserId);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setVisible(isAvailable());
+    }
+
+    protected RestrictedLockUtils.EnforcedAdmin getRestrictingAdmin() {
+        return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
+                mContext, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
+    }
+}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 358a533db74..bc1fbbf7f58 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -52,6 +52,7 @@
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.VibrationEffect;
@@ -87,6 +88,7 @@
 import androidx.preference.TwoStatePreference;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
@@ -103,10 +105,12 @@
 import com.android.settings.flags.Flags;
 import com.android.settings.msds.MSDLPlayerWrapper;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseBiometricSecondFactorPin;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.security.screenlock.BiometricSecondFactorPinSettings;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -202,7 +206,7 @@ protected boolean isPageSearchEnabled(Context context) {
                     @Override
                     public List<AbstractPreferenceController>
                             createPreferenceControllers(Context context) {
-                        return createThePreferenceControllers(context);
+                        return createThePreferenceControllers(context, null);
                     }
 
                     private boolean hasEnrolledFingerprints(Context context) {
@@ -216,29 +220,23 @@ private boolean hasEnrolledFingerprints(Context context) {
                 };
 
         private static List<AbstractPreferenceController> createThePreferenceControllers(Context
-                context) {
+                context, FingerprintSettingsFragment host) {
             final List<AbstractPreferenceController> controllers = new ArrayList<>();
             FingerprintManager manager = Utils.getFingerprintManagerOrNull(context);
             if (manager == null || !manager.isHardwareDetected()) {
                 return null;
             }
+
+            controllers.add(new FingerprintUnlockCategoryController(context,
+                    KEY_FINGERPRINT_UNLOCK_CATEGORY));
+
             if (manager.isPowerbuttonFps()) {
-                controllers.add(
-                        new FingerprintUnlockCategoryController(
-                                context,
-                                KEY_FINGERPRINT_UNLOCK_CATEGORY
-                        ));
                 controllers.add(
                         new FingerprintSettingsRequireScreenOnToAuthPreferenceController(
                                 context,
                                 KEY_REQUIRE_SCREEN_ON_TO_AUTH
                         ));
             } else if (screenOffUnlockUdfps()) {
-                controllers.add(
-                        new FingerprintUnlockCategoryController(
-                                context,
-                                KEY_FINGERPRINT_UNLOCK_CATEGORY
-                        ));
                 controllers.add(
                         new FingerprintSettingsScreenOffUnlockUdfpsPreferenceController(
                                 context,
@@ -253,6 +251,15 @@ private static List<AbstractPreferenceController> createThePreferenceControllers
             }
             controllers.add(new FingerprintsEnrolledCategoryPreferenceController(context,
                     KEY_FINGERPRINTS_ENROLLED_CATEGORY));
+            {
+                var c = new BiometricSecondFactorPinPreferenceController(context, host,
+                                KEY_BIOMETRIC_SECOND_FACTOR_PIN);
+                c.setSettingsRequestCode(
+                        BIOMETRIC_SECOND_FACTOR_PIN_SETTINGS_REQUEST);
+                c.setChooseRequestCode(
+                        BIOMETRIC_SECOND_FACTOR_PIN_CHOOSE_REQUEST);
+                controllers.add(c);
+            }
             return controllers;
         }
 
@@ -280,6 +287,8 @@ private static class FooterColumn {
         private static final String KEY_IS_ENROLLING = "is_enrolled";
         private static final String KEY_IS_LAUNCHING_EXT_PREF = "is_launching_ext_pref";
         private static final String KEY_HAS_RUN_CHALLENGE_INVOKER = "has_run_challenge_invoker";
+        private static final String KEY_LAUNCHED_BIOMETRIC_SECOND_FACTOR_PIN_ACTIVITY =
+                "launched_biometric_second_factor_pin_activity";
         @VisibleForTesting
         static final String KEY_REQUIRE_SCREEN_ON_TO_AUTH =
                 "security_settings_require_screen_on_to_auth";
@@ -299,6 +308,7 @@ private static class FooterColumn {
                 "biometrics_authentication_requested";
         private static final String KEY_BIOMETRICS_USE_FINGERPRINT_TO_CATEGORY =
                 "biometric_settings_use_fingerprint_to";
+        private static final String KEY_BIOMETRIC_SECOND_FACTOR_PIN = "biometric_second_factor_pin";
 
         private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
         private static final int MSG_FINGER_AUTH_SUCCESS = 1001;
@@ -310,6 +320,8 @@ private static class FooterColumn {
         private static final int CONFIRM_REQUEST = 101;
         @VisibleForTesting
         static final int CHOOSE_LOCK_GENERIC_REQUEST = 102;
+        public static final int BIOMETRIC_SECOND_FACTOR_PIN_SETTINGS_REQUEST = 9999;
+        public static final int BIOMETRIC_SECOND_FACTOR_PIN_CHOOSE_REQUEST = 9998;
         @VisibleForTesting
         static final int ADD_FINGERPRINT_REQUEST = 10;
         private static final int AUTO_ADD_FIRST_FINGERPRINT_REQUEST = 11;
@@ -321,6 +333,8 @@ private static class FooterColumn {
         private List<AbstractPreferenceController> mControllers;
         private FingerprintUnlockCategoryController
                 mFingerprintUnlockCategoryPreferenceController;
+        private BiometricSecondFactorPinPreferenceController
+                mBiometricSecondFactorPinPreferenceController;
         @VisibleForTesting
         public FingerprintSettingsRequireScreenOnToAuthPreferenceController
                 mRequireScreenOnToAuthPreferenceController;
@@ -332,12 +346,14 @@ private static class FooterColumn {
         private PreferenceCategory mFingerprintsEnrolledCategory;
         private PreferenceCategory mFingerprintUnlockCategory;
         private PreferenceCategory mFingerprintUnlockFooter;
+        private Preference mBiometricSecondFactorPin;
 
         private FingerprintManager mFingerprintManager;
         private FingerprintUpdater mFingerprintUpdater;
         private List<FingerprintSensorPropertiesInternal> mSensorProperties;
         private boolean mInFingerprintLockout;
         private byte[] mToken;
+        private LockscreenCredential mUserPassword;
         private boolean mLaunchedConfirm;
         private boolean mBiometricsAuthenticationRequested;
         private boolean mHasFirstEnrolled = true;
@@ -351,6 +367,7 @@ private static class FooterColumn {
         @NonNull private final ArrayList<String> mExtPrefKeys = new ArrayList<>();
         /** Use to make sure ChallengeGeneratedInvokers have been run */
         private boolean mHasRunChallengeInvoker = false;
+        private boolean mLaunchedBiometricSecondFactorPinActivity;
 
         private long mChallenge;
 
@@ -481,6 +498,11 @@ private boolean onExtIntentPreferenceClick(@NonNull Preference preference) {
          * Add new preferences from FingerprintExtPreferencesProvider
          */
         public void setupExtFingerprintPreferences() {
+            mBiometricSecondFactorPin = findPreference(KEY_BIOMETRIC_SECOND_FACTOR_PIN);
+            if (mBiometricSecondFactorPinPreferenceController != null) {
+                mBiometricSecondFactorPinPreferenceController.updateState(mBiometricSecondFactorPin);
+            }
+
             FingerprintExtPreferencesProvider preferencesProvider = getExtPreferenceProvider(
                     requireContext());
             for (int index = 0; index < preferencesProvider.getSize(); ++index) {
@@ -643,6 +665,15 @@ public void onCreate(Bundle savedInstanceState) {
                         mHasFirstEnrolled);
                 mBiometricsAuthenticationRequested = savedInstanceState.getBoolean(
                         KEY_BIOMETRICS_AUTHENTICATION_REQUESTED);
+                mLaunchedBiometricSecondFactorPinActivity = savedInstanceState.getBoolean(
+                        KEY_LAUNCHED_BIOMETRIC_SECOND_FACTOR_PIN_ACTIVITY
+                );
+                mUserPassword = savedInstanceState.getParcelable(
+                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+                mBiometricSecondFactorPinPreferenceController.setPrimaryCredential(mUserPassword);
+                // This controller needs userId set in #onActivityResult, but upstream doesn't set
+                // them until #onResume.
+                mBiometricSecondFactorPinPreferenceController.setUserId(mUserId);
             }
 
             // (mLaunchedConfirm or mIsEnrolling) means that we are waiting an activity result.
@@ -810,6 +841,8 @@ private void addFingerprintPreferences(PreferenceGroup root) {
                     ((FingerprintSettingsPreferenceController) controller).setUserId(mUserId);
                 } else if (controller instanceof FingerprintUnlockCategoryController) {
                     ((FingerprintUnlockCategoryController) controller).setUserId(mUserId);
+                } else if (controller instanceof BiometricSecondFactorPinPreferenceController c) {
+                    c.setUserId(mUserId);
                 }
             }
 
@@ -817,7 +850,8 @@ private void addFingerprintPreferences(PreferenceGroup root) {
             // |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary
             // user instead of the user with |mUserId|.
             if (isSfps() || (screenOffUnlockUdfps() && isScreenOffUnlcokSupported())
-                    || getExtPreferenceProvider(requireContext()).getSize() > 0) {
+                    || getExtPreferenceProvider(requireContext()).getSize() > 0
+                    || mBiometricSecondFactorPinPreferenceController != null) {
                 addFingerprintUnlockCategory();
             }
             final int descriptionRes = FeatureFactory.getFeatureFactory()
@@ -945,19 +979,22 @@ private void updateFingerprintUnlockCategoryVisibility() {
                         mScreenOffUnlockUdfpsPreferenceController.getAvailabilityStatus();
                 updatePreferenceVisibility(status, mScreenOffUnlockUdfpsPreference);
             }
-
-            final int categoryStatus =
-                    mFingerprintUnlockCategoryPreferenceController.getAvailabilityStatus();
-            updatePreferenceVisibility(categoryStatus, mFingerprintUnlockCategory);
+            if (mBiometricSecondFactorPinPreferenceController != null) {
+                mBiometricSecondFactorPinPreferenceController.updateState(mBiometricSecondFactorPin);
+            }
 
             if (!mExtPrefKeys.isEmpty()) {
                 for (String key: mExtPrefKeys) {
                     Preference preference = mFingerprintUnlockCategory.findPreference(key);
                     if (preference != null) {
-                        updatePreferenceVisibility(categoryStatus, preference);
+                        updatePreferenceVisibility(AVAILABLE, preference);
                     }
                 }
             }
+            // needs to be called last since it checks the children state
+            final int categoryStatus =
+                    mFingerprintUnlockCategoryPreferenceController.getAvailabilityStatus();
+            updatePreferenceVisibility(categoryStatus, mFingerprintUnlockCategory);
         }
 
         private void updatePreferenceVisibility(int availabilityStatus, Preference preference) {
@@ -1005,8 +1042,12 @@ private void setupUseFingerprintToPreferences() {
                     use(FingerprintSettingsKeyguardUnlockPreferenceController.class);
             fpUnlockController.setUserId(mUserId);
             fpUnlockController.displayPreference(getPreferenceScreen());
-            findPreference(fpUnlockController.getPreferenceKey())
-                    .setOnPreferenceChangeListener(fpUnlockController);
+            Preference fpUnlockPref = findPreference(fpUnlockController.getPreferenceKey());
+            fpUnlockPref.setOnPreferenceChangeListener(fpUnlockController);
+            fpUnlockPref.setOnPreferenceClickListener(p -> {
+                updateFingerprintUnlockCategoryVisibility();
+                return false;
+            });
 
             // Setup use fingerprint to verify it's you in apps preference
             final FingerprintSettingsAppsPreferenceController fingerprintAppController =
@@ -1173,7 +1214,8 @@ public void onPause() {
         public void onStop() {
             super.onStop();
             if (!getActivity().isChangingConfigurations() && !mLaunchedConfirm && !mIsEnrolling
-                    && mLaunchedExtPrefKey.isEmpty()) {
+                    && mLaunchedExtPrefKey.isEmpty()
+                    && !mLaunchedBiometricSecondFactorPinActivity) {
                 Log.d(TAG, "Finish activity for unknown stop");
                 setResult(RESULT_TIMEOUT);
                 getActivity().finish();
@@ -1202,6 +1244,10 @@ public void onSaveInstanceState(final Bundle outState) {
             outState.putBoolean(KEY_HAS_RUN_CHALLENGE_INVOKER, mHasRunChallengeInvoker);
             outState.putBoolean(KEY_BIOMETRICS_AUTHENTICATION_REQUESTED,
                     mBiometricsAuthenticationRequested);
+            outState.putBoolean(KEY_LAUNCHED_BIOMETRIC_SECOND_FACTOR_PIN_ACTIVITY,
+                    mLaunchedBiometricSecondFactorPinActivity);
+            outState.putParcelable(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+                    mUserPassword != null ? mUserPassword.duplicate() : null);
         }
 
         @Override
@@ -1224,6 +1270,8 @@ public boolean onPreferenceTreeClick(Preference pref) {
                 showRenameDialog(fp);
             } else if (KEY_FINGERPRINT_CHECK_ENROLLED.equals(key)) {
                 showCheckEnrolledDialog();
+            } else if (KEY_BIOMETRIC_SECOND_FACTOR_PIN.equals(key)) {
+                mLaunchedBiometricSecondFactorPinActivity = true;
             }
             return super.onPreferenceTreeClick(pref);
         }
@@ -1317,7 +1365,23 @@ protected List<AbstractPreferenceController> createPreferenceControllers(Context
 
         private List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
             final List<AbstractPreferenceController> controllers =
-                    createThePreferenceControllers(context);
+                    createThePreferenceControllers(context, this);
+            if (controllers == null) {
+                return controllers;
+            }
+
+            for (AbstractPreferenceController controller : controllers) {
+                switch (controller.getPreferenceKey()) {
+                    case KEY_FINGERPRINT_UNLOCK_CATEGORY:
+                        mFingerprintUnlockCategoryPreferenceController =
+                                (FingerprintUnlockCategoryController) controller;
+                        continue;
+                    case KEY_BIOMETRIC_SECOND_FACTOR_PIN:
+                        mBiometricSecondFactorPinPreferenceController =
+                                (BiometricSecondFactorPinPreferenceController) controller;
+                }
+            }
+
             if (isSfps()) {
                 for (AbstractPreferenceController controller : controllers) {
                     if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) {
@@ -1365,6 +1429,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     runChallengeGeneratedInvokers();
                     if (BiometricUtils.containsGatekeeperPasswordHandle(data)) {
+                        if (data.hasExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD)) {
+                            mUserPassword = data.getParcelableExtra(
+                                    ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+                            mBiometricSecondFactorPinPreferenceController.setPrimaryCredential(
+                                    mUserPassword);
+                        } else {
+                            Log.d(TAG, "Current primary credential missing");
+                            finish();
+                        }
+
                         final Utils.BiometricStatus biometricAuthStatus =
                                 Utils.requestBiometricAuthenticationForMandatoryBiometrics(
                                         getActivity(),
@@ -1471,6 +1545,32 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     }
                 }
                 mLaunchedExtPrefKey = "";
+            } else if (requestCode == BIOMETRIC_SECOND_FACTOR_PIN_CHOOSE_REQUEST) {
+                mLaunchedBiometricSecondFactorPinActivity = false;
+                // This technique of relying on the launched Activity to indicate timeout isn't
+                // perfect. If an app calls finish() for something other than RESULT_TIMEOUT, but
+                // the app is in background, then on returning to foreground there will be no
+                // RESULT_TIMEOUT. This is easily seen by adding a sleep(1000ms) before the finish()
+                // call and going to background during this time.
+                // The technique is used inconsistently throughout Settings app, such as
+                // ChooseLockGeneric using it, but not ChooseLockPassword. However, it is used
+                // consistently within FingerprintSettings, so I use it for second factor.
+                if (resultCode == ChooseBiometricSecondFactorPin
+                        .ChooseBiometricSecondFactorPinFragment.RESULT_NOT_FOREGROUND) {
+                    getActivity().setResult(RESULT_TIMEOUT);
+                    getActivity().finish();
+                } else if (resultCode == ChooseBiometricSecondFactorPin
+                        .ChooseBiometricSecondFactorPinFragment.RESULT_FINISHED) {
+                    mLaunchedBiometricSecondFactorPinActivity = true;
+                    mBiometricSecondFactorPinPreferenceController.launchSettings();
+                }
+            } else if (requestCode == BIOMETRIC_SECOND_FACTOR_PIN_SETTINGS_REQUEST) {
+                mLaunchedBiometricSecondFactorPinActivity = false;
+                if (resultCode ==
+                        BiometricSecondFactorPinSettings.RESULT_NOT_FOREGROUND) {
+                    getActivity().setResult(RESULT_TIMEOUT);
+                    getActivity().finish();
+                }
             }
         }
 
@@ -1544,6 +1644,15 @@ public void onDestroy() {
             if (getActivity().isFinishing()) {
                 mFingerprintManager.revokeChallenge(mUserId, mChallenge);
             }
+
+            if (mUserPassword != null) {
+                mUserPassword.zeroize();
+            }
+            new Handler(Looper.myLooper()).postDelayed(() -> {
+                System.gc();
+                System.runFinalization();
+                System.gc();
+            }, 5000);
         }
 
         private Drawable getHighlightDrawable() {
@@ -1632,6 +1741,7 @@ private void launchChooseOrConfirmLock() {
                         true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, true);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);
                 startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
             }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java
index c572f2d8584..eb53cb96686 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java
@@ -25,10 +25,12 @@
 import android.provider.Settings;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.Utils;
 import com.android.settings.biometrics.activeunlock.ActiveUnlockStatusUtils;
+import com.android.settingslib.RestrictedLockUtils;
 
 public class FingerprintSettingsKeyguardUnlockPreferenceController
         extends FingerprintSettingsPreferenceController {
@@ -49,8 +51,12 @@ public FingerprintSettingsKeyguardUnlockPreferenceController(
 
     @Override
     public boolean isChecked() {
-        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                FINGERPRINT_KEYGUARD_ENABLED, DEFAULT, getUserId()) == ON;
+        return isChecked(mContext, getUserId());
+    }
+
+    public static boolean isChecked(Context context, int userId) {
+        return Settings.Secure.getIntForUser(context.getContentResolver(),
+                FINGERPRINT_KEYGUARD_ENABLED, DEFAULT, userId) == ON;
     }
 
     @Override
@@ -77,18 +83,23 @@ public void updateState(Preference preference) {
 
     @Override
     public int getAvailabilityStatus() {
-        if (mUserManager.isManagedProfile(getUserId()) || !Utils.hasFingerprintHardware(mContext)) {
+        return getAvailabilityStatus(mContext, mUserManager, getRestrictingAdmin(), getUserId());
+    }
+
+    public static int getAvailabilityStatus(Context context, UserManager userManager,
+            @Nullable RestrictedLockUtils.EnforcedAdmin restrictingAdmin, int userId) {
+        if (userManager.isManagedProfile(userId) || !Utils.hasFingerprintHardware(context)) {
             return UNSUPPORTED_ON_DEVICE;
         }
         final ActiveUnlockStatusUtils activeUnlockStatusUtils =
-                new ActiveUnlockStatusUtils(mContext);
+                new ActiveUnlockStatusUtils(context);
         if (activeUnlockStatusUtils.isAvailable()) {
-            return getAvailabilityFromRestrictingAdmin();
+            return getAvailabilityFromRestrictingAdmin(restrictingAdmin);
         }
-        return getAvailabilityFromRestrictingAdmin();
+        return getAvailabilityFromRestrictingAdmin(restrictingAdmin);
     }
 
-    private int getAvailabilityFromRestrictingAdmin() {
-        return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE;
+    private static int getAvailabilityFromRestrictingAdmin(@Nullable RestrictedLockUtils.EnforcedAdmin restrictingAdmin) {
+        return restrictingAdmin != null ? DISABLED_FOR_USER : AVAILABLE;
     }
 }
diff --git a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
index bf97478feef..a70144d47e7 100644
--- a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
+++ b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
@@ -25,21 +25,34 @@
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.hardware.biometrics.BiometricFingerprintConstants;
 import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Log;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.util.Preconditions;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
+import com.google.hardware.biometrics.sidefps.IFingerprintExt;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class SfpsEnrollmentFeatureImpl implements SfpsEnrollmentFeature {
+    static final String TAG = SfpsEnrollmentFeatureImpl.class.getSimpleName();
+
     @VisibleForTesting
     public static final int HELP_ANIMATOR_DURATION = 550;
 
@@ -89,8 +102,31 @@ public int getSfpsEnrollLottiePerStage(int stage) {
         };
     }
 
+    private final boolean isGoogleDevice = "google".equals(Build.BRAND);
+    private float[] mEnrollStageThresholds;
+
     @Override
     public float getEnrollStageThreshold(@NonNull Context context, int index) {
+        if (isGoogleDevice) {
+            Log.d(TAG, "getEnrollStageThreshold " + index);
+            if (mEnrollStageThresholds == null) {
+                // TODO: extract these values automatically from SettingsGoogle resource:
+                //  com.google.android.settings.R.array.config_sfps_enroll_stage_thresholds
+                mEnrollStageThresholds = new float[] {
+                        0f, 0.04f, 0.48f, 0.52f
+                };
+            }
+
+            // this logic was copied from FingerprintManager.getEnrollStageThreshold()
+
+            if (index < 0 || index > mEnrollStageThresholds.length) {
+                Log.w(TAG, "Unsupported enroll stage index: " + index);
+                return index < 0 ? 0f : 1f;
+            }
+
+            return index == mEnrollStageThresholds.length ? 1f : mEnrollStageThresholds[index];
+        }
+
         if (mFingerprintManager == null) {
             mFingerprintManager = context.getSystemService(FingerprintManager.class);
         }
@@ -113,4 +149,93 @@ public Animator getHelpAnimator(@NonNull View target) {
     public boolean shouldAdjustHeaderText(@NonNull Configuration conf, boolean isFolded) {
         return conf.orientation == Configuration.ORIENTATION_LANDSCAPE;
     }
+
+    @Override
+    public void handleOnEnrollmentHelp(int helpMsgId, CharSequence helpString, Supplier<FingerprintEnrollEnrolling> enrollingSupplier) {
+        if (isGoogleDevice) {
+            Log.d(TAG, "handleOnEnrollmentHelp, helpMsgId: " + helpMsgId + ", helpString: " + helpString, new Throwable());
+            if (helpMsgId == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR_BASE ||
+                    helpMsgId == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE) {
+                Context ctx = enrollingSupplier.get();
+                Log.d(TAG, "getVendorString: " + getVendorString(ctx, 0));
+
+                if (getGoogleFingerprintExt() == null) {
+                    return;
+                }
+
+                if (mHelpDialog != null) {
+                    mHelpDialog.dismiss();
+                    mHelpDialog = null;
+                }
+
+                var d = new AlertDialog.Builder(ctx);
+                d.setMessage(getVendorString(ctx, VENDOR_STRING_FINGERPRINT_ACQUIRED_IMMOBILE));
+                d.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                    resumeEnroll();
+                });
+                mHelpDialog = d.show();
+            }
+        }
+    }
+
+    private AlertDialog mHelpDialog;
+
+    @Override
+    public CharSequence getFeaturedVendorString(Context context, int id, CharSequence msg) {
+        if (!isGoogleDevice) {
+            return msg;
+        }
+
+        Log.d(TAG, "getFeaturedVendorString, id: " + id + ", msg: " + msg, new Throwable());
+
+        if (id == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR_BASE ||
+                id == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMMOBILE) {
+            return getVendorString(context, VENDOR_STRING_FINGERPRINT_ACQUIRED_IMMOBILE);
+        }
+
+       return msg;
+    }
+
+    private static final int VENDOR_STRING_FINGERPRINT_ACQUIRED_IMMOBILE = 0;
+
+    private static String getVendorString(Context ctx, int index) {
+        String[] strings = ctx.getResources().getStringArray(R.array.fingerprint_acquired_vendor);
+        Preconditions.checkArgumentInRange(index, 0, strings.length - 1, "vendor string index");
+        return strings[index];
+    }
+
+    @Nullable
+    private static IFingerprintExt getGoogleFingerprintExt() {
+        String fpServiceName = android.hardware.biometrics.fingerprint.IFingerprint.class.getName() + "/default";
+        IBinder fpService = ServiceManager.getService(fpServiceName);
+        if (fpService == null) {
+            throw new IllegalStateException(fpServiceName + " is null");
+        }
+
+        IBinder fpServiceExt;
+        try {
+            fpServiceExt = fpService.getExtension();
+        } catch (RemoteException e) {
+            throw new IllegalStateException(e);
+        }
+
+        if (fpServiceExt == null) {
+            Log.e(TAG, "no IFingerprintExt");
+            return null;
+        }
+
+        return IFingerprintExt.Stub.asInterface(fpServiceExt);
+    }
+
+    private static void resumeEnroll() {
+        IFingerprintExt fpExt = getGoogleFingerprintExt();
+        if (fpExt == null) {
+            return;
+        }
+        try {
+            fpExt.resumeEnroll();
+        } catch (RemoteException e) {
+            Log.e(TAG, "", e);
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothAutoOffPrefController.java b/src/com/android/settings/bluetooth/BluetoothAutoOffPrefController.java
new file mode 100644
index 00000000000..14791951802
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothAutoOffPrefController.java
@@ -0,0 +1,39 @@
+package com.android.settings.bluetooth;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.ext.settings.ExtSettings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.AutoOffSetting;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class BluetoothAutoOffPrefController extends IntSettingPrefController {
+
+    public BluetoothAutoOffPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.BLUETOOTH_AUTO_OFF);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        int r = super.getAvailabilityStatus();
+        if (r == AVAILABLE) {
+            return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH) ?
+                    AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        }
+        return r;
+    }
+
+    @Override
+    public void addPrefsBeforeList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.bluetooth_auto_off_footer);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        AutoOffSetting.getEntries(entries);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index df9deb57d80..a106ed33704 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -118,11 +118,8 @@ public BluetoothPairingController(Intent intent, Context context) {
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        if (isChecked) {
-            mPbapAllowed = true;
-        } else {
-            mPbapAllowed = false;
-        }
+        mPbapAllowed = isChecked;
+        Log.d(TAG, "phonebook access permission toggle isChecked: " + isChecked);
     }
 
     @Override
@@ -233,37 +230,18 @@ public boolean isContactSharingVisible() {
      * contacts
      */
     public boolean getContactSharingState() {
-        switch (mDevice.getPhonebookAccessPermission()) {
+        int permission = mDevice.getPhonebookAccessPermission();
+        switch (permission) {
             case BluetoothDevice.ACCESS_ALLOWED:
                 return true;
             case BluetoothDevice.ACCESS_REJECTED:
+            case BluetoothDevice.ACCESS_UNKNOWN:
                 return false;
             default:
-                if (BluetoothUtils.isDeviceClassMatched(
-                        mDevice, BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)) {
-                    return BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND == mInitiator;
-                }
-                return false;
+                throw new IllegalStateException("getPhonebookAccessPermission returned " + permission);
         }
     }
 
-    /**
-     * Update Phone book permission
-     *
-     */
-     public void setContactSharingState() {
-         final int permission = mDevice.getPhonebookAccessPermission();
-         if (permission == BluetoothDevice.ACCESS_ALLOWED
-                 || (permission == BluetoothDevice.ACCESS_UNKNOWN
-                 && BluetoothUtils.isDeviceClassMatched(mDevice,
-                 BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE))) {
-             onCheckedChanged(null, true);
-         } else {
-             onCheckedChanged(null, false);
-         }
-
-     }
-
     /**
      * A method for querying if the provided editable is a valid passkey/pin format for this device.
      *
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index ad38b972f55..3d45e394a44 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -251,7 +251,7 @@ private View createPinEntryView() {
             contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
             contactSharing.setVisibility(
                     mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);
-            mPairingController.setContactSharingState();
+            // OnCheckedChangeListener has to be registered before the initial setChecked()
             contactSharing.setOnCheckedChangeListener(mPairingController);
             contactSharing.setChecked(mPairingController.getContactSharingState());
         }
@@ -348,9 +348,9 @@ private View createView() {
         CompoundButton contactSharing = getContactSharingSwitch(view);
         view.findViewById(R.id.phonebook_sharing).setVisibility(
                 mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);
-        mPairingController.setContactSharingState();
-        contactSharing.setChecked(mPairingController.getContactSharingState());
+        // OnCheckedChangeListener has to be registered before the initial setChecked()
         contactSharing.setOnCheckedChangeListener(mPairingController);
+        contactSharing.setChecked(mPairingController.getContactSharingState());
 
         messagePairing.setVisibility(mPairingController.isDisplayPairingKeyVariant()
                 ? View.VISIBLE : View.GONE);
diff --git a/src/com/android/settings/communal/WidgetsOnLockscreenFragment.java b/src/com/android/settings/communal/WidgetsOnLockscreenFragment.java
index 09a1e4d1c3e..266a12af509 100644
--- a/src/com/android/settings/communal/WidgetsOnLockscreenFragment.java
+++ b/src/com/android/settings/communal/WidgetsOnLockscreenFragment.java
@@ -17,6 +17,7 @@
 package com.android.settings.communal;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -46,5 +47,10 @@ protected String getLogTag() {
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.widgets_on_lockscreen_settings);
+            new BaseSearchIndexProvider() {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return false;
+                }
+            };
 }
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
index 2b86a2ad048..57215f11486 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
@@ -35,7 +35,6 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
 
     private static final String DRIVING_MODE_SETTINGS_ENABLED =
             "gearhead:driving_mode_settings_enabled";
-    private static final String GEARHEAD_PACKAGE = "com.google.android.projection.gearhead";
 
     public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -60,7 +59,7 @@ public static int getConnectedDevicesSummaryResourceId(Context context) {
                 new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC);
 
         return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
-                isDrivingModeAvailable(context), isAndroidAutoSettingAvailable(context));
+                isDrivingModeAvailable(context), false);
     }
 
     @VisibleForTesting
@@ -69,13 +68,6 @@ static boolean isDrivingModeAvailable(Context context) {
                 getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
     }
 
-    @VisibleForTesting
-    static boolean isAndroidAutoSettingAvailable(Context context) {
-        final Intent intent = new Intent(IA_SETTINGS_ACTION);
-        intent.setPackage(GEARHEAD_PACKAGE);
-        return intent.resolveActivity(context.getPackageManager()) != null;
-    }
-
     @VisibleForTesting
     static int getConnectedDevicesSummaryResourceId(NfcPreferenceController
             nfcPreferenceController,
diff --git a/src/com/android/settings/core/PreferenceControllerListHelper.java b/src/com/android/settings/core/PreferenceControllerListHelper.java
index 9dc0a9fa108..30d41d88c3e 100644
--- a/src/com/android/settings/core/PreferenceControllerListHelper.java
+++ b/src/com/android/settings/core/PreferenceControllerListHelper.java
@@ -31,6 +31,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
+import com.android.settings.ext.BoolSettingPrefController;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -59,6 +60,7 @@ public static List<BasePreferenceController> getPreferenceControllersFromXml(Con
         try {
             preferenceMetadata = PreferenceXmlParserUtils.extractMetadata(context, xmlResId,
                     MetadataFlag.FLAG_NEED_KEY | MetadataFlag.FLAG_NEED_PREF_CONTROLLER
+                            | MetadataFlag.FLAG_NEED_BOOL_SETTING_FIELD
                             | MetadataFlag.FLAG_INCLUDE_PREF_SCREEN  | MetadataFlag.FLAG_FOR_WORK);
         } catch (IOException | XmlPullParserException e) {
             Log.e(TAG, "Failed to parse preference xml for getting controllers", e);
@@ -68,6 +70,7 @@ public static List<BasePreferenceController> getPreferenceControllersFromXml(Con
         for (Bundle metadata : preferenceMetadata) {
             final String controllerName = metadata.getString(METADATA_CONTROLLER);
             if (TextUtils.isEmpty(controllerName)) {
+                BoolSettingPrefController.maybeAdd(context, metadata, controllers);
                 continue;
             }
             BasePreferenceController controller;
diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java
index cf2f9ca179b..5d4758deeff 100644
--- a/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -65,6 +65,7 @@ public class PreferenceXmlParserUtils {
             MetadataFlag.FLAG_NEED_KEY,
             MetadataFlag.FLAG_NEED_PREF_TYPE,
             MetadataFlag.FLAG_NEED_PREF_CONTROLLER,
+            MetadataFlag.FLAG_NEED_BOOL_SETTING_FIELD,
             MetadataFlag.FLAG_NEED_PREF_TITLE,
             MetadataFlag.FLAG_NEED_PREF_SUMMARY,
             MetadataFlag.FLAG_NEED_PREF_ICON,
@@ -92,11 +93,14 @@ public class PreferenceXmlParserUtils {
         int FLAG_FOR_WORK = 1 << 12;
         int FLAG_NEED_HIGHLIGHTABLE_MENU_KEY = 1 << 13;
         int FLAG_NEED_USER_RESTRICTION = 1 << 14;
+
+        int FLAG_NEED_BOOL_SETTING_FIELD = 1 << 30;
     }
 
     public static final String METADATA_PREF_TYPE = "type";
     public static final String METADATA_KEY = "key";
     public static final String METADATA_CONTROLLER = "controller";
+    public static final String METADATA_BOOL_SETTING_FIELD = "bool_setting_field";
     public static final String METADATA_TITLE = "title";
     public static final String METADATA_SUMMARY = "summary";
     public static final String METADATA_ICON = "icon";
@@ -163,6 +167,10 @@ public static List<Bundle> extractMetadata(Context context, @XmlRes int xmlResId
                 preferenceMetadata.putString(METADATA_CONTROLLER,
                         getController(preferenceAttributes));
             }
+            if (hasFlag(flags, MetadataFlag.FLAG_NEED_BOOL_SETTING_FIELD)) {
+                preferenceMetadata.putString(METADATA_BOOL_SETTING_FIELD,
+                        getBoolSettingField(preferenceAttributes));
+            }
             if (hasFlag(flags, MetadataFlag.FLAG_NEED_PREF_TITLE)) {
                 preferenceMetadata.putString(METADATA_TITLE, getTitle(preferenceAttributes));
             }
@@ -231,6 +239,10 @@ private static String getController(TypedArray styledAttributes) {
         return styledAttributes.getString(R.styleable.Preference_controller);
     }
 
+    private static String getBoolSettingField(TypedArray styledAttributes) {
+        return styledAttributes.getString(R.styleable.Preference_boolSettingField);
+    }
+
     private static String getHighlightableMenuKey(TypedArray styledAttributes) {
         return styledAttributes.getString(R.styleable.Preference_highlightableMenuKey);
     }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 4b86248264a..5f0be8505ca 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -229,6 +229,13 @@ public class SettingsGateway {
      * security exception if the fragment it needs to display is not in this list.
      */
     public static final String[] ENTRY_FRAGMENTS = {
+            com.android.settings.applications.AppNativeDebuggingFragment.class.getName(),
+            com.android.settings.applications.AppMemtagFragment.class.getName(),
+            com.android.settings.applications.AppHardenedMallocFragment.class.getName(),
+            com.android.settings.applications.AppMemoryDynCodeLoadingFragment.class.getName(),
+            com.android.settings.applications.AppStorageDynCodeLoadingFragment.class.getName(),
+            com.android.settings.applications.AppManagePlayIntegrityApiFragment.class.getName(),
+            com.android.settings.safetycenter.ExploitProtectionFragment.class.getName(),
             AdvancedConnectedDeviceDashboardFragment.class.getName(),
             CreateShortcut.class.getName(),
             BluetoothPairingDetail.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 26a1f7ff63f..f93c417c89a 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -42,6 +42,7 @@
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.privacy.PrivacyDashboardFragment;
+import com.android.settings.safetycenter.ExploitProtectionFragment;
 import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
 import com.android.settings.safetycenter.ui.PrivacyControlsFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
@@ -73,6 +74,8 @@ public class DashboardFragmentRegistry {
 
     static {
         PARENT_TO_CATEGORY_KEY_MAP = new ArrayMap<>();
+        PARENT_TO_CATEGORY_KEY_MAP.put(ExploitProtectionFragment.class.getName(),
+                CategoryKey.CATEGORY_EXPLOIT_PROTECTION_SETTINGS);
         PARENT_TO_CATEGORY_KEY_MAP.put(TopLevelSettings.class.getName(),
                 CategoryKey.CATEGORY_HOMEPAGE);
         PARENT_TO_CATEGORY_KEY_MAP.put(
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index a2d57d06dcd..a418ce3193c 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -237,7 +237,14 @@ int getTabId(Activity activity, Bundle bundle) {
             if (mainUser == null) {
                 mainUser = UserHandle.SYSTEM;
             }
-            final int userId = bundle.getInt(EXTRA_USER_ID, mainUser.getIdentifier());
+            UserHandle activityUser = activity.getUser();
+            final int userIdFallback;
+            if (mainUser.getIdentifier() != activityUser.getIdentifier()) {
+                userIdFallback = activityUser.getIdentifier();
+            } else {
+                userIdFallback = mainUser.getIdentifier();
+            }
+            final int userId = bundle.getInt(EXTRA_USER_ID, userIdFallback);
             final boolean isWorkProfile = UserManager.get(activity).isManagedProfile(userId);
             if (isWorkProfile) {
                 return WORK_TAB;
@@ -340,6 +347,18 @@ private CharSequence getPageTitle(int position) {
                                         userInfo.id,
                                         bundle != null ? bundle.deepCopy() : new Bundle(),
                                         privateFragmentConstructor));
+                        UserInfo parentUserInfo = userInfos.stream()
+                                .filter(info -> info.id == UserHandle.myUserId())
+                                .toList().get(0);
+                        if (!parentUserInfo.isMain() && parentUserInfo.canHaveProfile(
+                                UserManager.USER_TYPE_PROFILE_PRIVATE)) {
+                            fragments.add(0,
+                                    createAndGetFragment(
+                                            ProfileType.PERSONAL,
+                                            parentUserInfo.id,
+                                            bundle != null ? bundle.deepCopy() : new Bundle(),
+                                            personalFragmentConstructor));
+                        }
                     }
                 } else {
                     Log.d(TAG, "Not showing tab for unsupported user " + userInfo);
diff --git a/src/com/android/settings/development/DSULoader.java b/src/com/android/settings/development/DSULoader.java
index fede67a7766..957e3d79e6f 100644
--- a/src/com/android/settings/development/DSULoader.java
+++ b/src/com/android/settings/development/DSULoader.java
@@ -305,7 +305,7 @@ Date getDeviceSPL() {
         }
 
         boolean isSupported() {
-            boolean supported = true;
+            boolean supported = false;
             String cpu = getDeviceCpu();
             if (!mCpuAbi.equals(cpu)) {
                 Slog.i(TAG, mCpuAbi + " != " + cpu);
diff --git a/src/com/android/settings/development/DeveloperOptionsActivityLifecycle.java b/src/com/android/settings/development/DeveloperOptionsActivityLifecycle.java
index de5c52b90a7..12be21f7bb8 100644
--- a/src/com/android/settings/development/DeveloperOptionsActivityLifecycle.java
+++ b/src/com/android/settings/development/DeveloperOptionsActivityLifecycle.java
@@ -26,6 +26,7 @@
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.profileselector.ProfileSelectLinuxTerminalFragment;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 public class DeveloperOptionsActivityLifecycle implements Application.ActivityLifecycleCallbacks {
@@ -43,7 +44,8 @@ public void onFragmentResumed(@NonNull FragmentManager fm, @NonNull Fragment f)
                         return;
                     }
 
-                    if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(activity)) {
+                    boolean skipAdminCheck = f instanceof ProfileSelectLinuxTerminalFragment;
+                    if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(activity, skipAdminCheck)) {
                         return;
                     }
 
diff --git a/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java b/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
index 93d3a0bf184..c3e1a03f252 100644
--- a/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
+++ b/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
@@ -18,11 +18,13 @@
 
 import static android.system.virtualmachine.VirtualMachineManager.CAPABILITY_NON_PROTECTED_VM;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Process;
 import android.os.storage.StorageManager;
 import android.system.virtualmachine.VirtualMachineManager;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DataUnit;
 
@@ -70,13 +72,23 @@ public LinuxTerminalPreferenceController(@NonNull Context context) {
                                 != 0);
     }
 
+    public boolean mIsInSystemSettings;
+
     // Avoid lazy initialization because this may be called before displayPreference().
     @Override
     public boolean isAvailable() {
         // Check build flag RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES indirectly
         // by checking whether the terminal app is installed.
         // TODO(b/343795511): Add explicitly check for the flag when it's accessible from Java code.
-        return mTerminalPackageName != null && mIsDeviceCapable;
+        boolean res = mTerminalPackageName != null && mIsDeviceCapable;
+
+        if (res && mIsInSystemSettings) {
+            ContentResolver cr = mContext.getContentResolver();
+            String key = Settings.Global.DEVELOPMENT_SETTINGS_ENABLED;
+            res = Settings.Global.getInt(cr, key, 0) == 1;
+        }
+
+        return res;
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BootloaderVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/BootloaderVersionPreferenceController.java
new file mode 100644
index 00000000000..32b1cb64de0
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BootloaderVersionPreferenceController.java
@@ -0,0 +1,28 @@
+package com.android.settings.deviceinfo.firmwareversion;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
+
+public class BootloaderVersionPreferenceController extends BasePreferenceController {
+
+    static final String BOOTLOADER_PROPERTY = "ro.bootloader";
+
+    public BootloaderVersionPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return SystemProperties.get(BOOTLOADER_PROPERTY,
+                mContext.getString(R.string.device_info_default));
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt
index a310a206b27..c2dff41d9b1 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt
+++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreference.kt
@@ -90,7 +90,7 @@ class MainlineModuleVersionPreference :
         return MODULE_UPDATE_ACTION_V2.resolveIntent() ?: MODULE_UPDATE_ACTION.resolveIntent()
     }
 
-    override fun isAvailable(context: Context) = getModuleVersion(context).isNotEmpty()
+    override fun isAvailable(context: Context) = false
 
     override fun bind(preference: Preference, metadata: PreferenceMetadata) {
         super.bind(preference, metadata)
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareSkuPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareSkuPreferenceController.java
new file mode 100644
index 00000000000..4be09710e8c
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareSkuPreferenceController.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.deviceinfo.hardwareinfo;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.slices.Sliceable;
+
+public class HardwareSkuPreferenceController extends BasePreferenceController {
+
+    public HardwareSkuPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_device_model) &&
+                !TextUtils.isEmpty(getSummary()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean useDynamicSliceSummary() {
+        return true;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return SystemProperties.get("ro.boot.hardware.sku");
+    }
+}
diff --git a/src/com/android/settings/display/AltTouchscreenModePrefController.java b/src/com/android/settings/display/AltTouchscreenModePrefController.java
new file mode 100644
index 00000000000..70a27cbe814
--- /dev/null
+++ b/src/com/android/settings/display/AltTouchscreenModePrefController.java
@@ -0,0 +1,52 @@
+package com.android.settings.display;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.ext.settings.AltTouchscreenMode;
+import android.os.Handler;
+import android.os.PowerManager;
+
+import com.android.settings.ext.BoolSettingPrefController;
+import com.android.settings.R;
+
+public class AltTouchscreenModePrefController extends BoolSettingPrefController {
+
+    public AltTouchscreenModePrefController(Context ctx, String key) {
+        super(ctx, key, AltTouchscreenMode.getSetting());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!AltTouchscreenMode.isAvailable(mContext)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        return super.getAvailabilityStatus();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        super.setChecked(isChecked);
+        if (!isChecked) {
+            return true;
+        }
+
+        Handler handler = mContext.getMainThreadHandler();
+        Runnable undo = () -> {
+            super.setChecked(false);
+            mContext.getSystemService(PowerManager.class).reboot(null);
+        };
+        // disable the alt mode after a delay unless the user confirms that the touchscreen is
+        // still working
+        handler.postDelayed(undo, 10_000);
+
+        var b = new AlertDialog.Builder(mContext);
+        b.setMessage(R.string.alt_touchscreen_mode_confirm_message);
+        b.setPositiveButton(R.string.alt_touchscreen_mode_confirm_button, (d, btn) -> {
+            handler.removeCallbacks(undo);
+        });
+        b.show();
+
+        return true;
+    }
+}
diff --git a/src/com/android/settings/display/BatterySharePreferenceController.java b/src/com/android/settings/display/BatterySharePreferenceController.java
new file mode 100644
index 00000000000..39b9066cdb9
--- /dev/null
+++ b/src/com/android/settings/display/BatterySharePreferenceController.java
@@ -0,0 +1,99 @@
+package com.android.settings.display;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
+import com.android.internal.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import vendor.google.wireless_charger.ReverseWirelessCharger;
+
+public class BatterySharePreferenceController extends BasePreferenceController implements
+        PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver,
+        OnStart, OnStop {
+
+    private static final String KEY_BATTERY_SHARE = "battery_share";
+    private final ReverseWirelessCharger wirelessCharger;
+    private final Context mContext;
+    private Preference mPreference;
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            ((Activity) mContext).runOnUiThread(() -> update());
+        }
+    };
+
+
+    public BatterySharePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mContext = context;
+        wirelessCharger = ReverseWirelessCharger.getInstance();
+    }
+
+    public boolean isPlugged(Context context) {
+        Intent intent = context.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+        return plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        update();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BATTERY_SHARE;
+    }
+
+    private void update() {
+        if (mPreference == null) return;
+        boolean enabled = !isPlugged(mContext) && wirelessCharger.isRtxSupported();
+        mPreference.setEnabled(enabled);
+        ((TwoStatePreference) mPreference).setChecked(wirelessCharger.isRtxModeOn());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return wirelessCharger.isRtxSupported() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        update();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        wirelessCharger.setRtxMode((Boolean) newValue);
+        return true;
+    }
+
+    @Override
+    public void onStart() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        mContext.registerReceiver(mBroadcastReceiver, filter);
+    }
+
+    @Override
+    public void onStop() {
+        mContext.unregisterReceiver(mBroadcastReceiver);
+    }
+}
diff --git a/src/com/android/settings/display/ScreenResolutionFragment.java b/src/com/android/settings/display/ScreenResolutionFragment.java
index 224a6f3b391..2ae60648b1a 100644
--- a/src/com/android/settings/display/ScreenResolutionFragment.java
+++ b/src/com/android/settings/display/ScreenResolutionFragment.java
@@ -107,9 +107,6 @@ protected int getPreferenceScreenResId() {
 
     @Override
     protected void addStaticPreferences(PreferenceScreen screen) {
-        updateIllustrationImage(mImagePreference);
-        screen.addPreference(mImagePreference);
-
         final FooterPreference footerPreference = new FooterPreference(screen.getContext());
         footerPreference.setTitle(R.string.screen_resolution_footer);
         footerPreference.setSelectable(false);
@@ -229,7 +226,6 @@ protected boolean setDefaultKey(final String key) {
         }
 
         setDisplayMode(width);
-        updateIllustrationImage(mImagePreference);
 
         return true;
     }
diff --git a/src/com/android/settings/display/TouchSensitivityPreferenceController.java b/src/com/android/settings/display/TouchSensitivityPreferenceController.java
new file mode 100755
index 00000000000..1e632590c21
--- /dev/null
+++ b/src/com/android/settings/display/TouchSensitivityPreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 The Proton AOSP 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.display;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.R;
+
+public class TouchSensitivityPreferenceController extends TogglePreferenceController {
+
+    // Settings can only set the debug.* property, so we need to persist it
+    // in system settings. Match the stock setting name for backup compatibility.
+    private static final String SETTINGS_KEY = "touch_sensitivity_enabled";
+    private static final String PROP_NAME = "debug.touch_sensitivity_mode";
+
+    public TouchSensitivityPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_touch_sensitivity)
+            ? AVAILABLE
+            : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean setChecked(boolean value) {
+        Settings.Secure.putInt(mContext.getContentResolver(), SETTINGS_KEY, value ? 1 : 0);
+        SystemProperties.set(PROP_NAME, value ? "1" : "0");
+        return true;
+    }
+
+    @Override
+    public boolean isChecked() {
+        // debug prop isn't persistent
+        return Settings.Secure.getInt(mContext.getContentResolver(), SETTINGS_KEY, 0) == 1;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_display;
+    }
+}
diff --git a/src/com/android/settings/ext/AbstractListPreferenceController.java b/src/com/android/settings/ext/AbstractListPreferenceController.java
new file mode 100644
index 00000000000..a5686e370ee
--- /dev/null
+++ b/src/com/android/settings/ext/AbstractListPreferenceController.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2022 GrapheneOS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.settings.ext;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.SparseIntArray;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.utils.CandidateInfoExtra;
+import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.FooterPreference;
+
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+public abstract class AbstractListPreferenceController extends BasePreferenceController
+    implements DefaultLifecycleObserver {
+
+    private Preference preference;
+    private Entries entries;
+
+    @Nullable
+    public RadioButtonPickerFragment2 fragment;
+
+    protected AbstractListPreferenceController(Context ctx, String key) {
+        super(ctx, key);
+    }
+
+    // call entries.add(entryName, entryValue) to add entries.
+    // entryValues can be mapped from other values or sets of values, as long as getCurrentValue()
+    // and setValue() methods are consistent
+    protected abstract void getEntries(Entries entries);
+
+    public void getEntriesAsCandidates(ArrayList<CandidateInfo> dst) {
+        Entries e = new Entries(mContext);
+        getEntries(e);
+
+        dst.addAll(e.list);
+    }
+
+    protected abstract int getCurrentValue();
+    protected abstract boolean setValue(int val);
+
+    @Override
+    public void updateState(Preference p) {
+        if (entries == null) {
+            entries = new Entries(mContext);
+            getEntries(entries);
+        }
+
+        if (p != preference) {
+            p.setSingleLineTitle(false);
+            p.setPersistent(false);
+            this.preference = p;
+        }
+
+        updatePreference();
+    }
+
+    void updatePreference() {
+        if (fragment != null) {
+            fragment.updateCandidates();
+        }
+
+        Preference p = preference;
+        if (p == null) {
+            return;
+        }
+
+        int idx = entries.getIndexForValue(getCurrentValue());
+        if (idx >= 0) {
+            p.setSummary(entries.list.get(idx).loadLabel());
+        } else {
+            p.setSummary(null);
+        }
+    }
+
+    public static class Entries {
+        private final Context context;
+        private final ArrayList<CandidateInfoExtra> list = new ArrayList<>();
+        private final SparseIntArray valueToIndexMap = new SparseIntArray();
+
+        Entries(Context context) {
+            this.context = context;
+        }
+
+        public void add(@StringRes int title, int value) {
+            add(context.getText(title), value);
+        }
+
+        public void add(@StringRes int title, @StringRes int summary, int value) {
+            add(context.getText(title), context.getText(summary), value);
+        }
+
+        public void add(int duration, TimeUnit timeUnit) {
+            long durationMillis = timeUnit.toMillis(duration);
+            if (durationMillis > Integer.MAX_VALUE) {
+                throw new IllegalArgumentException();
+            }
+
+            add(DateUtils.formatDuration(durationMillis), (int) durationMillis);
+        }
+
+        public void add(CharSequence title, int value) {
+            add(title, null, value, true);
+        }
+
+        public void add(CharSequence title, CharSequence summary, int value) {
+            add(title, summary, value, true);
+        }
+
+        public void add(CharSequence title, @Nullable CharSequence summary, int value, boolean enabled) {
+            String prefKey = Integer.toString(value);
+            list.add(new CandidateInfoExtra(title, summary, prefKey, enabled));
+            valueToIndexMap.put(value, list.size() - 1);
+        }
+
+        public int getIndexForValue(int val) {
+            return valueToIndexMap.get(val, -1);
+        }
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return NO_RES;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return super.handlePreferenceTreeClick(preference);
+        }
+
+        if (this.preference instanceof ListPreference) {
+            return super.handlePreferenceTreeClick(preference);
+        }
+
+        UserHandle workProfileUser = getWorkProfileUser();
+        boolean isForWork = workProfileUser != null;
+
+        RadioButtonPickerFragment2.fillArgs(preference, this, isForWork);
+
+        new SubSettingLauncher(preference.getContext())
+                .setDestination(RadioButtonPickerFragment2.class.getName())
+                .setSourceMetricsCategory(preference.getExtras().getInt(DashboardFragment.CATEGORY,
+                                                                        SettingsEnums.PAGE_UNKNOWN))
+                .setTitleText(preference.getTitle())
+                .setArguments(preference.getExtras())
+                .setUserHandle(workProfileUser)
+                .launch();
+        return true;
+    }
+
+    public void addPrefsBeforeList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+
+    }
+
+    public void addPrefsAfterList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+
+    }
+
+    public FooterPreference addFooterPreference(PreferenceScreen screen, @StringRes int text) {
+        Context ctx = screen.getContext();
+        return addFooterPreference(screen, ctx.getText(text), null, null);
+    }
+
+    public FooterPreference addFooterPreference(PreferenceScreen screen,
+                                                @StringRes int text, String learnMoreUrl) {
+        return addFooterPreference(screen, text, R.string.learn_more, learnMoreUrl);
+    }
+
+    public FooterPreference addFooterPreference(
+            PreferenceScreen screen, @StringRes int text,
+            @StringRes int learnMoreText, String learnMoreUrl) {
+        Context ctx = screen.getContext();
+        Runnable learnMoreAction = () -> {
+            var intent = new Intent(Intent.ACTION_VIEW, Uri.parse(learnMoreUrl));
+            ctx.startActivity(intent);
+        };
+        return addFooterPreference(screen, ctx.getText(text),
+                ctx.getText(learnMoreText), learnMoreAction);
+    }
+
+    public FooterPreference addFooterPreference(
+            PreferenceScreen screen, @StringRes int text,
+            @StringRes int learnMoreText, Runnable learnMoreAction) {
+        Context ctx = screen.getContext();
+        return addFooterPreference(screen, ctx.getText(text), ctx.getText(learnMoreText), learnMoreAction);
+    }
+
+    public FooterPreference addFooterPreference(PreferenceScreen screen, CharSequence text,
+                                                @Nullable CharSequence learnMoreText,
+                                                @Nullable Runnable learnMoreAction) {
+        var p = new FooterPreference(screen.getContext());
+        p.setSelectable(false);
+        p.setSummary(text);
+        if (learnMoreText != null) {
+            p.setLearnMoreText(learnMoreText);
+            Objects.requireNonNull(learnMoreAction);
+            p.setLearnMoreAction(v -> learnMoreAction.run());
+        }
+        p.setOrder(Preference.DEFAULT_ORDER);
+        screen.addPreference(p);
+        return p;
+    }
+
+    protected final CharSequence getText(@StringRes int resId) {
+        return mContext.getText(resId);
+    }
+
+    /**
+     * Returns whether to require user credential confirmation before changing this preference.
+     */
+    protected boolean isCredentialConfirmationRequired() {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/ext/AbstractTogglePrefController.java b/src/com/android/settings/ext/AbstractTogglePrefController.java
new file mode 100644
index 00000000000..ceee6984bfd
--- /dev/null
+++ b/src/com/android/settings/ext/AbstractTogglePrefController.java
@@ -0,0 +1,38 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public abstract class AbstractTogglePrefController extends TogglePreferenceController {
+
+    protected AbstractTogglePrefController(Context ctx, String key) {
+        super(ctx, key);
+    }
+
+    @Nullable protected Preference preference;
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        if (preference != this.preference) {
+            preference.setSingleLineTitle(false);
+            preference.setPersistent(false);
+            this.preference = preference;
+        }
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return NO_RES;
+    }
+}
diff --git a/src/com/android/settings/ext/AppPrefUtils.java b/src/com/android/settings/ext/AppPrefUtils.java
new file mode 100644
index 00000000000..3ae426bf36f
--- /dev/null
+++ b/src/com/android/settings/ext/AppPrefUtils.java
@@ -0,0 +1,14 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+import androidx.annotation.StringRes;
+
+public class AppPrefUtils {
+
+    public static String getFooterForDefaultHardeningSetting(Context ctx, @StringRes int baseText) {
+        return ctx.getString(R.string.app_exploit_protection_default_value_warning) + "\n\n" + ctx.getString(baseText);
+    }
+}
diff --git a/src/com/android/settings/ext/AutoOffSetting.java b/src/com/android/settings/ext/AutoOffSetting.java
new file mode 100644
index 00000000000..98be94b8589
--- /dev/null
+++ b/src/com/android/settings/ext/AutoOffSetting.java
@@ -0,0 +1,25 @@
+package com.android.settings.ext;
+
+import com.android.settings.R;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class AutoOffSetting {
+
+    public static void getEntries(AbstractListPreferenceController.Entries entries) {
+        entries.add(R.string.auto_off_never, 0);
+        entries.add(15, SECONDS);
+        entries.add(30, SECONDS);
+        entries.add(1,  MINUTES);
+        entries.add(2,  MINUTES);
+        entries.add(5,  MINUTES);
+        entries.add(10, MINUTES);
+        entries.add(30, MINUTES);
+        entries.add(1,  HOURS);
+        entries.add(2,  HOURS);
+        entries.add(4,  HOURS);
+        entries.add(8,  HOURS);
+    }
+}
diff --git a/src/com/android/settings/ext/BoolSettingFragment.java b/src/com/android/settings/ext/BoolSettingFragment.java
new file mode 100644
index 00000000000..e342faa688d
--- /dev/null
+++ b/src/com/android/settings/ext/BoolSettingFragment.java
@@ -0,0 +1,157 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+import android.content.Intent;
+import android.ext.settings.BoolSetting;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.widget.FooterPreference;
+
+public abstract class BoolSettingFragment extends DashboardFragment implements ExtSettingPrefController<BoolSetting> {
+
+    private static final String TAG = BoolSettingFragment.class.getSimpleName();
+
+    protected SwitchPreferenceCompat mainSwitch;
+    protected boolean invertSetting;
+
+    private ExtSettingControllerHelper<BoolSetting> helper;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        helper = new ExtSettingControllerHelper<>(requireContext(), getSetting());
+
+        getActivity().setTitle(getTitle());
+
+        Context ctx = requireContext();
+
+        PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(ctx);
+
+        var mainSwitch = new SwitchPreferenceCompat(ctx);
+        mainSwitch.setTitle(getMainSwitchTitle());
+
+        this.mainSwitch = mainSwitch;
+        refreshMainSwitch();
+
+        mainSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+            boolean state = (boolean) newValue;
+
+            if (invertSetting) {
+                state = !state;
+            }
+
+            if (interceptMainSwitchChange(state)) {
+                return false;
+            }
+
+            if (!getSetting().put(requireContext(), state)) {
+                return false;
+            }
+
+            onMainSwitchChanged(state);
+
+            return true;
+        });
+
+        screen.addPreference(mainSwitch);
+
+        addExtraPrefs(screen);
+
+        FooterPreference footer = makeFooterPref(new FooterPreference.Builder(ctx));
+
+        if (footer != null) {
+            screen.addPreference(footer);
+        }
+
+        setPreferenceScreen(screen);
+    }
+
+    protected abstract BoolSetting getSetting();
+
+    protected abstract CharSequence getTitle();
+
+    protected CharSequence getMainSwitchTitle() {
+        return getText(R.string.bool_setting_enable);
+    }
+
+    protected CharSequence getMainSwitchSummary() {
+        return null;
+    }
+
+    protected void addExtraPrefs(PreferenceScreen screen) {}
+
+    protected FooterPreference makeFooterPref(FooterPreference.Builder builder) {
+        return null;
+    }
+
+    protected static void setFooterPrefLearnMoreUri(FooterPreference p, Uri uri) {
+        p.setLearnMoreAction(v -> {
+            var intent = new Intent(Intent.ACTION_VIEW, uri);
+            p.getContext().startActivity(intent);
+        });
+    }
+
+    protected boolean interceptMainSwitchChange(boolean newValue) {
+        return false;
+    }
+
+    protected void onMainSwitchChanged(boolean state) {}
+
+    protected void refreshMainSwitch() {
+        boolean state = getSetting().get(requireContext());
+        if (invertSetting) {
+            state = !state;
+        }
+        mainSwitch.setChecked(state);
+
+        CharSequence mainSwitchSummary = getMainSwitchSummary();
+        if (mainSwitchSummary != null) {
+            mainSwitch.setSummary(mainSwitchSummary);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        helper.onResume(this);
+        refreshMainSwitch();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        helper.onPause(this);
+    }
+
+    @Override
+    public void accept(BoolSetting setting) {
+        refreshMainSwitch();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return METRICS_CATEGORY_UNKNOWN;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return 0;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    protected final CharSequence resText(int res) {
+        return requireContext().getText(res);
+    }
+}
diff --git a/src/com/android/settings/ext/BoolSettingFragmentPrefController.java b/src/com/android/settings/ext/BoolSettingFragmentPrefController.java
new file mode 100644
index 00000000000..3f9223b800a
--- /dev/null
+++ b/src/com/android/settings/ext/BoolSettingFragmentPrefController.java
@@ -0,0 +1,26 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+import android.ext.settings.BoolSetting;
+
+import com.android.settings.R;
+
+public abstract class BoolSettingFragmentPrefController extends ExtSettingFragmentPrefController<BoolSetting> {
+
+    protected BoolSettingFragmentPrefController(Context ctx, String key, BoolSetting setting) {
+        super(ctx, key, setting);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return setting.get(mContext) ? getSummaryOn() : getSummaryOff();
+    }
+
+    protected CharSequence getSummaryOn() {
+        return resText(R.string.bool_setting_enabled);
+    }
+
+    protected CharSequence getSummaryOff() {
+        return resText(R.string.bool_setting_disabled);
+    }
+}
diff --git a/src/com/android/settings/ext/BoolSettingPrefController.java b/src/com/android/settings/ext/BoolSettingPrefController.java
new file mode 100644
index 00000000000..659585dc5dd
--- /dev/null
+++ b/src/com/android/settings/ext/BoolSettingPrefController.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2022 GrapheneOS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.settings.ext;
+
+import android.content.Context;
+import android.ext.settings.BoolSetting;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Objects;
+
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_BOOL_SETTING_FIELD;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
+
+public class BoolSettingPrefController extends AbstractTogglePrefController
+        implements ExtSettingPrefController<BoolSetting> {
+    private final BoolSetting setting;
+    private final ExtSettingControllerHelper<BoolSetting> helper;
+
+    public BoolSettingPrefController(Context ctx, String key, BoolSetting setting) {
+        this(ctx, key, setting, ctx.getUser());
+    }
+
+    public BoolSettingPrefController(Context ctx, String key, BoolSetting setting, UserHandle user) {
+        super(ctx, key);
+        this.setting = setting;
+        Context userContext = ctx.getUser().equals(user) ? ctx : ctx.createContextAsUser(user, 0);
+        helper = new ExtSettingControllerHelper<>(userContext, setting);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return helper.getAvailabilityStatus();
+    }
+
+    @Override
+    public final boolean isChecked() {
+        return setting.get(helper.context);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return setting.put(helper.context, isChecked);
+    }
+
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        helper.onResume(this);
+    }
+
+    @Override
+    public void onPause(@NonNull LifecycleOwner owner) {
+        helper.onPause(this);
+    }
+
+    // called by the setting observer
+    @Override
+    public void accept(BoolSetting boolSetting) {
+        if (preference != null) {
+            updateState(preference);
+        }
+    }
+
+    // called when PreferenceScreen XML is parsed
+    public static void maybeAdd(Context context, Bundle metadata,
+                                List<BasePreferenceController> dest) {
+        String boolSettingField = metadata.getString(METADATA_BOOL_SETTING_FIELD);
+        if (boolSettingField == null) {
+            return;
+        }
+        String[] split = boolSettingField.split(" ");
+
+        BoolSetting boolSetting;
+        try {
+            Class c = Class.forName(split[0]);
+            Field field = c.getField(split[1]);
+            boolSetting = (BoolSetting) Objects.requireNonNull(field.get(null));
+        } catch (Exception e) {
+            throw new IllegalStateException("Invalid BoolSetting field " + boolSettingField);
+        }
+
+        String key = Objects.requireNonNull(metadata.getString(METADATA_KEY));
+
+        dest.add(new BoolSettingPrefController(context, key, boolSetting));
+    }
+}
diff --git a/src/com/android/settings/ext/ExtSettingControllerHelper.java b/src/com/android/settings/ext/ExtSettingControllerHelper.java
new file mode 100644
index 00000000000..1c8e70d4cdb
--- /dev/null
+++ b/src/com/android/settings/ext/ExtSettingControllerHelper.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 GrapheneOS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.settings.ext;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.ext.settings.Setting;
+import android.provider.Settings;
+
+import java.util.function.Consumer;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
+public class ExtSettingControllerHelper<T extends Setting> {
+    public final Context context;
+    private final T setting;
+
+    ExtSettingControllerHelper(Context context, T setting) {
+        this.context = context;
+        this.setting = setting;
+    }
+
+    public static int getGlobalSettingAvailability(Context ctx) {
+        return ctx.getUser().isSystem() ? AVAILABLE : DISABLED_FOR_USER;
+    }
+
+    public static int getSecondaryUserOnlySettingAvailability(Context ctx) {
+        return ctx.getUser().isSystem() ? DISABLED_FOR_USER : AVAILABLE;
+    }
+
+    public static int getDevModeSettingAvailability(Context ctx) {
+        ContentResolver cr = ctx.getContentResolver();
+        String key = Settings.Global.DEVELOPMENT_SETTINGS_ENABLED;
+
+        return (Settings.Global.getInt(cr, key, 0) == 0) ?
+            CONDITIONALLY_UNAVAILABLE : AVAILABLE;
+    }
+
+    int getAvailabilityStatus() {
+        if (setting.getScope() != Setting.Scope.PER_USER) {
+            return getGlobalSettingAvailability(context);
+        }
+        return AVAILABLE;
+    }
+
+    private Object observer;
+
+    void onResume(ExtSettingPrefController espc) {
+        registerObserver(espc);
+    }
+
+    void onPause(ExtSettingPrefController espc) {
+        unregisterObserver();
+    }
+
+    void registerObserver(Consumer<T> settingObserver) {
+        if (setting.canObserveState()) {
+            observer = setting.registerObserver(context, context.getMainThreadHandler(), settingObserver);
+        }
+    }
+
+    void unregisterObserver() {
+        if (setting.canObserveState()) {
+            setting.unregisterObserver(context, observer);
+        }
+    }
+}
diff --git a/src/com/android/settings/ext/ExtSettingFragmentPrefController.java b/src/com/android/settings/ext/ExtSettingFragmentPrefController.java
new file mode 100644
index 00000000000..2d87635e0d2
--- /dev/null
+++ b/src/com/android/settings/ext/ExtSettingFragmentPrefController.java
@@ -0,0 +1,42 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+import android.ext.settings.Setting;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+
+public abstract class ExtSettingFragmentPrefController<T extends Setting> extends FragmentPrefController
+        implements ExtSettingPrefController<T> {
+    protected final T setting;
+    protected final ExtSettingControllerHelper<T> helper;
+
+    protected ExtSettingFragmentPrefController(Context ctx, String key, T setting) {
+        super(ctx, key);
+        this.setting = setting;
+        helper = new ExtSettingControllerHelper<T>(ctx, setting);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return helper.getAvailabilityStatus();
+    }
+
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        helper.onResume(this);
+    }
+
+    @Override
+    public void onPause(@NonNull LifecycleOwner owner) {
+        helper.onPause(this);
+    }
+
+    // called by the setting observer
+    @Override
+    public void accept(T setting) {
+        if (preference != null) {
+            updateState(preference);
+        }
+    }
+}
diff --git a/src/com/android/settings/ext/ExtSettingPrefController.java b/src/com/android/settings/ext/ExtSettingPrefController.java
new file mode 100644
index 00000000000..f641e344b50
--- /dev/null
+++ b/src/com/android/settings/ext/ExtSettingPrefController.java
@@ -0,0 +1,12 @@
+package com.android.settings.ext;
+
+import android.ext.settings.Setting;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+
+import java.util.function.Consumer;
+
+interface ExtSettingPrefController<T extends Setting> extends DefaultLifecycleObserver, Consumer<T> {
+}
diff --git a/src/com/android/settings/ext/FragmentPrefController.java b/src/com/android/settings/ext/FragmentPrefController.java
new file mode 100644
index 00000000000..b09ab9615c2
--- /dev/null
+++ b/src/com/android/settings/ext/FragmentPrefController.java
@@ -0,0 +1,36 @@
+package com.android.settings.ext;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.android.settings.core.BasePreferenceController;
+
+public abstract class FragmentPrefController<FragmentType extends PreferenceFragmentCompat>
+        extends BasePreferenceController {
+
+    protected FragmentPrefController(Context ctx, String key) {
+        super(ctx, key);
+    }
+
+    @Nullable
+    protected Preference preference;
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        if (preference != this.preference) {
+            preference.setSingleLineTitle(false);
+            preference.setPersistent(false);
+
+            this.preference = preference;
+        }
+    }
+
+    protected final CharSequence resText(int res) {
+        return mContext.getText(res);
+    }
+}
diff --git a/src/com/android/settings/ext/IntSettingPrefController.java b/src/com/android/settings/ext/IntSettingPrefController.java
new file mode 100644
index 00000000000..38ecc9a89b3
--- /dev/null
+++ b/src/com/android/settings/ext/IntSettingPrefController.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2022 GrapheneOS
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.settings.ext;
+
+import android.content.Context;
+import android.ext.settings.IntSetting;
+import android.os.UserHandle;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
+
+public abstract class IntSettingPrefController extends AbstractListPreferenceController
+        implements ExtSettingPrefController<IntSetting>
+{
+    private final IntSetting setting;
+    private final ExtSettingControllerHelper<IntSetting> helper;
+
+    protected IntSettingPrefController(Context ctx, String key, IntSetting setting) {
+        this(ctx, key, setting, ctx.getUser());
+    }
+
+    protected IntSettingPrefController(Context ctx, String key, IntSetting setting, UserHandle user) {
+        super(ctx, key);
+        this.setting = setting;
+        Context userContext = ctx.getUser().equals(user) ? ctx : ctx.createContextAsUser(user, 0);
+        helper = new ExtSettingControllerHelper<>(userContext, setting);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return helper.getAvailabilityStatus();
+    }
+
+    @Override
+    protected final int getCurrentValue() {
+        return setting.get(helper.context);
+    }
+
+    @Override
+    protected boolean setValue(int val) {
+        return setting.put(helper.context, val);
+    }
+
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        helper.onResume(this);
+    }
+
+    @Override
+    public void onPause(@NonNull LifecycleOwner owner) {
+        helper.onPause(this);
+    }
+
+    // called by the setting observer
+    @Override
+    public void accept(IntSetting intSetting) {
+        updatePreference();
+    }
+}
diff --git a/src/com/android/settings/ext/RadioButtonPickerFragment2.java b/src/com/android/settings/ext/RadioButtonPickerFragment2.java
new file mode 100644
index 00000000000..a44c9280af7
--- /dev/null
+++ b/src/com/android/settings/ext/RadioButtonPickerFragment2.java
@@ -0,0 +1,208 @@
+package com.android.settings.ext;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.utils.CandidateInfoExtra;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RadioButtonPickerFragment2 extends RadioButtonPickerFragment {
+
+    private final ArrayList<CandidateInfo> candidates = new ArrayList<>();
+
+    static final String KEY_PREF_CONTROLLER_CLASS = "pref_controller";
+    static final String KEY_PREF_KEY = "pref_key";
+
+    private AbstractListPreferenceController prefController;
+
+    public static void fillArgs(Preference pref, AbstractListPreferenceController pc, boolean isForWork) {
+        Bundle args = pref.getExtras();
+        args.putString(KEY_PREF_CONTROLLER_CLASS, pc.getClass().getName());
+        args.putString(KEY_PREF_KEY, pc.getPreferenceKey());
+        args.putBoolean(EXTRA_FOR_WORK, isForWork);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Bundle args = requireArguments();
+        String prefControllerClass = args.getString(KEY_PREF_CONTROLLER_CLASS);
+        String prefKey = args.getString(KEY_PREF_KEY);
+        boolean forWork = args.getBoolean(EXTRA_FOR_WORK);
+
+        Context ctx = requireContext();
+
+        prefController = (AbstractListPreferenceController) BasePreferenceController
+                .createInstance(ctx,prefControllerClass, prefKey, forWork);
+        prefController.fragment = this;
+
+        super.onCreate(savedInstanceState);
+    }
+
+    private static final String KEY_USER_CREDENTIAL_CONFIRMED = "user_credential_confirmed";
+    private boolean userCredentialConfirmed;
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        PreferenceScreen ps = getPreferenceManager().createPreferenceScreen(requireContext());
+        setPreferenceScreen(ps);
+
+        if (savedInstanceState != null) {
+            userCredentialConfirmed = savedInstanceState.getBoolean(
+                    KEY_USER_CREDENTIAL_CONFIRMED, false);
+        }
+
+        updateCandidates();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_USER_CREDENTIAL_CONFIRMED, userCredentialConfirmed);
+    }
+
+    private Runnable onAfterCredentialConfirmed;
+
+    private void runAfterCredentialConfirmation(Runnable runnable) {
+        if (userCredentialConfirmed) {
+            throw new IllegalStateException();
+        }
+
+        if (onAfterCredentialConfirmed != null) {
+            throw new IllegalStateException();
+        }
+
+        onAfterCredentialConfirmed = runnable;
+
+        var b = new ChooseLockSettingsHelper.Builder(requireActivity());
+        b.setActivityResultLauncher(credentialConfirmationLauncher);
+        b.setForegroundOnly(true);
+        b.show();
+    }
+
+    private final ActivityResultLauncher<Intent> credentialConfirmationLauncher =
+            registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                this::onCredentialConfirmationResult);
+
+    private void onCredentialConfirmationResult(@Nullable ActivityResult result) {
+        Runnable r = onAfterCredentialConfirmed;
+        onAfterCredentialConfirmed = null;
+
+        if (result != null && result.getResultCode() == Activity.RESULT_OK) {
+            userCredentialConfirmed = true;
+            if (r != null) {
+                r.run();
+            }
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (!requireActivity().isChangingConfigurations()) {
+            userCredentialConfirmed = false;
+        }
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return -1;
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        candidates.clear();
+        prefController.getEntriesAsCandidates(candidates);
+        return candidates;
+    }
+
+    @Override
+    protected void addPrefsBeforeList(PreferenceScreen screen) {
+        prefController.addPrefsBeforeList(this, screen);
+    }
+
+    @Override
+    protected void addPrefsAfterList(PreferenceScreen screen) {
+        prefController.addPrefsAfterList(this, screen);
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return Integer.toString(prefController.getCurrentValue());
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        if (key.equals(getDefaultKey())) {
+            return true;
+        }
+
+        if (!userCredentialConfirmed && prefController.isCredentialConfirmationRequired()) {
+            Context ctx = requireContext();
+            LockPatternUtils lpu = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(ctx);
+
+            if (lpu.isSecure(ctx.getUserId())) {
+                runAfterCredentialConfirmation(() -> prefController.setValue(Integer.parseInt(key)));
+                return false;
+            }
+        }
+
+        return prefController.setValue(Integer.parseInt(key));
+    }
+
+    @Override
+    public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info,
+                                    String defaultKey, String systemDefaultKey) {
+        pref.setSingleLineTitle(false);
+
+        if (info instanceof CandidateInfoExtra) {
+            var cie = (CandidateInfoExtra) info;
+            pref.setSummary(cie.loadSummary());
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return METRICS_CATEGORY_UNKNOWN;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        prefController.onPause(this);
+    }
+
+    private boolean updateCandidatesOnResume;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        prefController.onResume(this);
+
+        if (updateCandidatesOnResume) {
+            updateCandidates();
+        } else {
+            // updateCandidates() is called from onCreatePrefences() right before the first onResume()
+            updateCandidatesOnResume = true;
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/AppBatteryUsagePrefController.java b/src/com/android/settings/fuelgauge/AppBatteryUsagePrefController.java
new file mode 100644
index 00000000000..d2ea1044d0e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/AppBatteryUsagePrefController.java
@@ -0,0 +1,32 @@
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.spa.SpaActivity;
+import com.android.settings.spa.app.battery.BatteryOptimizationModeAppListPageProvider;
+
+public class AppBatteryUsagePrefController extends BasePreferenceController {
+
+    public AppBatteryUsagePrefController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        SpaActivity.startSpaActivity(mContext, BatteryOptimizationModeAppListPageProvider.INSTANCE.getName());
+        return true;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryChargingOptimizationFragment.java b/src/com/android/settings/fuelgauge/BatteryChargingOptimizationFragment.java
new file mode 100644
index 00000000000..04d7a6b8129
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryChargingOptimizationFragment.java
@@ -0,0 +1,82 @@
+package com.android.settings.fuelgauge;
+
+import android.ext.power.BatteryChargeLimit;
+import android.ext.settings.BoolSetting;
+import android.icu.text.NumberFormat;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.ext.BoolSettingFragment;
+import com.android.settingslib.widget.FooterPreference;
+import com.google.android.settings.fuelgauge.GoogleBattery;
+
+import vendor.google.google_battery.IGoogleBattery;
+
+public class BatteryChargingOptimizationFragment extends BoolSettingFragment {
+    private static final String TAG = "BatteryChargingOptimizationFragment";
+
+    @Override
+    protected boolean interceptMainSwitchChange(boolean newValue) {
+        int policy = newValue ?
+                IGoogleBattery.BatteryChargingPolicy.LONGLIFE :
+                IGoogleBattery.BatteryChargingPolicy.DEFAULT;
+
+        // block setting update if policy update fails
+        return !setChargingPolicy(policy);
+    }
+
+    static boolean setChargingPolicy(int policy) {
+        IGoogleBattery service = GoogleBattery.getService();
+        if (service == null) {
+            return false;
+        }
+        try {
+            service.setChargingPolicy(policy);
+            Log.d(TAG, "setChargingPolicy to " + policy);
+            return true;
+        } catch (RemoteException e) {
+            Log.e(TAG, "", e);
+            return false;
+        }
+    }
+
+    @Override
+    protected BoolSetting getSetting() {
+        return BatteryChargeLimit.getSetting();
+    }
+
+    @Override
+    protected CharSequence getTitle() {
+        return getText(R.string.charging_optimization_title);
+    }
+
+    @Override
+    protected CharSequence getMainSwitchTitle() {
+        return requireContext().getString(
+                R.string.charging_optimization_entry_summary_charge_limit,
+                NumberFormat.getPercentInstance().format(BatteryChargeLimit.CHARGE_LEVEL / 100f));
+    }
+
+    @Override
+    protected void onMainSwitchChanged(boolean state) {
+        footer.setVisible(getSetting().get(requireContext()));
+    }
+
+    private FooterPreference footer;
+
+    @Override
+    protected FooterPreference makeFooterPref(FooterPreference.Builder builder) {
+        String text = requireContext().getString(
+                R.string.charging_optimization_footer_message_charge_limit,
+                NumberFormat.getPercentInstance().format(BatteryChargeLimit.CHARGE_LEVEL / 100f),
+                NumberFormat.getPercentInstance().format(1f));
+
+        builder.setTitle(text);
+
+        FooterPreference pref = builder.build();
+        pref.setVisible(getSetting().get(requireContext()));
+        this.footer = pref;
+        return pref;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryChargingOptimizationPrefController.java b/src/com/android/settings/fuelgauge/BatteryChargingOptimizationPrefController.java
new file mode 100644
index 00000000000..eade15ab7e9
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryChargingOptimizationPrefController.java
@@ -0,0 +1,40 @@
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.ext.power.BatteryChargeLimit;
+import android.icu.text.NumberFormat;
+
+import com.android.settings.R;
+import com.android.settings.ext.BoolSettingFragmentPrefController;
+import com.android.settings.ext.ExtSettingControllerHelper;
+
+public class BatteryChargingOptimizationPrefController extends BoolSettingFragmentPrefController {
+    private static final String TAG = "BatteryChargeLimitPrefController";
+
+    public BatteryChargingOptimizationPrefController(Context ctx, String key) {
+        super(ctx, key, BatteryChargeLimit.getSetting());
+    }
+
+    @Override
+    protected CharSequence getSummaryOn() {
+        return mContext.getString(R.string.charging_optimization_entry_summary_charge_limit,
+                        NumberFormat.getPercentInstance().format(BatteryChargeLimit.CHARGE_LEVEL / 100f));
+    }
+
+    @Override
+    protected CharSequence getSummaryOff() {
+        return mContext.getString(R.string.charging_optimization_summary_off);
+    }
+
+    static int getAvailabilityStatus(Context ctx) {
+        if (!BatteryChargeLimit.isGoogleDevice()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return ExtSettingControllerHelper.getGlobalSettingAvailability(ctx);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return getAvailabilityStatus(mContext);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
index 19c10d78306..d2b9c0cebb1 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
@@ -32,17 +32,17 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
 
     @Override
     public boolean isManufactureDateAvailable(Context context, long manufactureDateMs) {
-        return false;
+        return manufactureDateMs > 1_609_459_200_000L; // 2021-01-01
     }
 
     @Override
     public boolean isFirstUseDateAvailable(Context context, long firstUseDateMs) {
-        return false;
+        return firstUseDateMs > 1_609_459_200_000L; // 2021-01-01
     }
 
     @Override
     public boolean isBatteryInfoEnabled(Context context) {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
index fef30563fe2..6b057484c9f 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
@@ -616,14 +616,10 @@ public static NameAndIcon getNameAndIconFromPowerComponent(
                 iconId = R.drawable.ic_settings_aod;
                 break;
             default:
-                Log.w(
-                        TAG,
-                        "unknown attribute:"
-                                + DebugUtils.constantToString(
-                                        BatteryConsumer.class,
-                                        "POWER_COMPONENT_",
-                                        powerComponentId));
-                name = null;
+                String fieldName = DebugUtils.constantToString(
+                        BatteryConsumer.class, "POWER_COMPONENT_", powerComponentId);
+                Log.w(TAG, "unknown attribute:" + fieldName);
+                name = context.getResources().getString(R.string.header_category_system) + " (" + fieldName + ")";
                 iconId = R.drawable.ic_power_system;
                 break;
         }
diff --git a/src/com/android/settings/location/GnssPsdsPrefController.java b/src/com/android/settings/location/GnssPsdsPrefController.java
new file mode 100644
index 00000000000..73279f2d23a
--- /dev/null
+++ b/src/com/android/settings/location/GnssPsdsPrefController.java
@@ -0,0 +1,49 @@
+package com.android.settings.location;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.ext.settings.GnssSettings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class GnssPsdsPrefController extends IntSettingPrefController {
+    private final String psdsType;
+    private final boolean hasGpsFeature;
+
+    public GnssPsdsPrefController(Context ctx, String key) {
+        super(ctx, key, GnssSettings.getPsdsSetting(ctx));
+        psdsType = ctx.getString(com.android.internal.R.string.config_gnssPsdsType);
+        hasGpsFeature = ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION_GPS);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!hasGpsFeature) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+
+        int result = super.getAvailabilityStatus();
+        if (result == AVAILABLE) {
+            if (psdsType.isEmpty()) {
+                result = UNSUPPORTED_ON_DEVICE;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void addPrefsAfterList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.gnss_psds_footer);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.psds_enabled_grapheneos_server, GnssSettings.PSDS_SERVER_GRAPHENEOS);
+        entries.add(R.string.psds_enabled_standard_server, GnssSettings.PSDS_SERVER_STANDARD);
+        entries.add(R.string.psds_disabled, R.string.psds_disabled_summary, GnssSettings.PSDS_DISABLED);
+    }
+}
diff --git a/src/com/android/settings/location/GnssSuplPrefController.java b/src/com/android/settings/location/GnssSuplPrefController.java
new file mode 100644
index 00000000000..95be474c9de
--- /dev/null
+++ b/src/com/android/settings/location/GnssSuplPrefController.java
@@ -0,0 +1,40 @@
+package com.android.settings.location;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.ext.settings.GnssSettings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class GnssSuplPrefController extends IntSettingPrefController {
+    private final boolean hasGpsFeature;
+
+    public GnssSuplPrefController(Context ctx, String key) {
+        super(ctx, key, GnssSettings.SUPL_SETTING);
+        hasGpsFeature = ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION_GPS);
+    }
+
+    @Override
+    public void addPrefsAfterList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.pref_gnss_supl_footer);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!hasGpsFeature) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return super.getAvailabilityStatus();
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.supl_enabled_grapheneos_proxy, GnssSettings.SUPL_SERVER_GRAPHENEOS_PROXY);
+        entries.add(R.string.supl_enabled_standard_server, GnssSettings.SUPL_SERVER_STANDARD);
+        entries.add(R.string.supl_disabled, R.string.supl_disabled_summary, GnssSettings.SUPL_DISABLED);
+    }
+}
diff --git a/src/com/android/settings/location/LocationServicesGeocoderPreferenceController.kt b/src/com/android/settings/location/LocationServicesGeocoderPreferenceController.kt
new file mode 100644
index 00000000000..1409908c99c
--- /dev/null
+++ b/src/com/android/settings/location/LocationServicesGeocoderPreferenceController.kt
@@ -0,0 +1,34 @@
+package com.android.settings.location
+
+import android.content.Context
+import android.ext.settings.GeocoderSettings
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.IntSettingPrefController
+import com.android.settings.ext.RadioButtonPickerFragment2
+
+/**
+ * Preference controller for Geocoder in Location Services.
+ */
+class LocationServicesGeocoderPreferenceController(ctx: Context, key: String?) :
+    IntSettingPrefController(ctx, key, GeocoderSettings.GEOCODER_SETTING) {
+
+    override fun addPrefsAfterList(fragment: RadioButtonPickerFragment2, screen: PreferenceScreen) {
+        addFooterPreference(screen, R.string.geocoder_footer)
+    }
+
+    override fun getEntries(entries: Entries) {
+        entries.add(
+            R.string.geocoder_enabled_grapheneos_proxy,
+            GeocoderSettings.GEOCODER_SERVER_GRAPHENEOS_PROXY
+        )
+        entries.add(
+            R.string.geocoder_enabled_nominatim_server,
+            GeocoderSettings.GEOCODER_SERVER_NOMINATIM
+        )
+        entries.add(
+            R.string.geocoder_disabled,
+            GeocoderSettings.GEOCODER_DISABLED
+        )
+    }
+}
diff --git a/src/com/android/settings/location/LocationServicesNetworkLocationPreferenceController.kt b/src/com/android/settings/location/LocationServicesNetworkLocationPreferenceController.kt
new file mode 100644
index 00000000000..4b34ea66db5
--- /dev/null
+++ b/src/com/android/settings/location/LocationServicesNetworkLocationPreferenceController.kt
@@ -0,0 +1,38 @@
+package com.android.settings.location
+
+import android.content.Context
+import android.ext.settings.NetworkLocationSettings
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.ext.IntSettingPrefController
+import com.android.settings.ext.RadioButtonPickerFragment2
+
+/**
+ * Preference controller for Network location in Location Services.
+ */
+class LocationServicesNetworkLocationPreferenceController(ctx: Context, key: String?) :
+    IntSettingPrefController(ctx, key, NetworkLocationSettings.NETWORK_LOCATION_SETTING) {
+
+    override fun addPrefsAfterList(fragment: RadioButtonPickerFragment2, screen: PreferenceScreen) {
+        addFooterPreference(screen, R.string.network_location_footer)
+    }
+
+    override fun getEntries(entries: Entries) {
+        entries.add(
+            R.string.network_location_enabled_grapheneos_apple_proxy,
+            NetworkLocationSettings.NETWORK_LOCATION_GRAPHENEOS_APPLE_PROXY
+        )
+        entries.add(
+            R.string.network_location_enabled_apple,
+            NetworkLocationSettings.NETWORK_LOCATION_APPLE
+        )
+        entries.add(
+            R.string.network_location_enabled_apple_china,
+            NetworkLocationSettings.NETWORK_LOCATION_APPLE_CHINA
+        )
+        entries.add(
+            R.string.network_location_disabled,
+            NetworkLocationSettings.NETWORK_LOCATION_DISABLED
+        )
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index c93b450ba01..7cfcbe55c9d 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -53,7 +53,7 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
     RecentAppOpsAccess mRecentLocationApps;
     private PreferenceCategory mCategoryRecentLocationRequests;
     private int mType = ProfileSelectFragment.ProfileType.ALL;
-    private boolean mShowSystem = false;
+    private boolean mShowSystem = true;
     private boolean mSystemSettingChanged = false;
 
     @VisibleForTesting
@@ -108,9 +108,9 @@ public RecentLocationAccessPreferenceController(Context context, String key,
         super(context, key);
         mRecentLocationApps = recentLocationApps;
         mShowSystem = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
-                SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, false)
+                SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, true)
                 ? Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 0) == 1
+                Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 1) == 1
                 : false;
     }
 
diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java b/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
index 0ea9ffbdacb..b45bca51c4f 100644
--- a/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
+++ b/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
@@ -40,7 +40,7 @@ public class RecentLocationAccessSeeAllFragment extends DashboardFragment {
     private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1;
     private static final int MENU_HIDE_SYSTEM = Menu.FIRST + 2;
 
-    private boolean mShowSystem = false;
+    private boolean mShowSystem = true;
     private MenuItem mShowSystemMenu;
     private MenuItem mHideSystemMenu;
     private RecentLocationAccessSeeAllPreferenceController mController;
@@ -61,9 +61,9 @@ public void onAttach(Context context) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mShowSystem = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
-            SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, false)
+            SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, true)
             ? Settings.Secure.getInt(getContentResolver(),
-            Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 0) == 1
+            Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 1) == 1
             : false;
     }
 
diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
index 50c105b44c5..6eb1402b413 100644
--- a/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
@@ -57,11 +57,11 @@ public RecentLocationAccessSeeAllPreferenceController(Context context, String ke
                                 DeviceConfig.NAMESPACE_PRIVACY,
                                 SystemUiDeviceConfigFlags
                                         .PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,
-                                false)
+                                true)
                         ? Settings.Secure.getInt(
                                         mContext.getContentResolver(),
                                         Settings.Secure.LOCATION_SHOW_SYSTEM_OPS,
-                                        0)
+                                        1)
                                 == 1
                         : false;
 
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index 39211ee5202..bee904efdc4 100644
--- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -87,9 +87,9 @@ public void displayPreference(PreferenceScreen screen) {
         final List<RecentLocationApps.Request> recentLocationRequests = new ArrayList<>();
         final UserManager userManager = UserManager.get(mContext);
         final boolean showSystem = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
-                SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, false)
+                SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, true)
                 ? Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 0) == 1
+                Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, 1) == 1
                 : false;
 
         for (RecentLocationApps.Request request : mRecentLocationApps.getAppListSorted(
diff --git a/src/com/android/settings/network/ConnectivityChecksPrefController.java b/src/com/android/settings/network/ConnectivityChecksPrefController.java
new file mode 100644
index 00000000000..ef2ee6c12ee
--- /dev/null
+++ b/src/com/android/settings/network/ConnectivityChecksPrefController.java
@@ -0,0 +1,29 @@
+package com.android.settings.network;
+
+import android.content.Context;
+import android.ext.settings.ConnChecksSetting;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class ConnectivityChecksPrefController extends IntSettingPrefController {
+
+    public ConnectivityChecksPrefController(Context ctx, String key) {
+        super(ctx, key, ConnChecksSetting.SYS_PROP);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.conn_checks_grapheneos_server, ConnChecksSetting.VAL_GRAPHENEOS);
+        entries.add(R.string.conn_checks_google_server, ConnChecksSetting.VAL_STANDARD);
+        entries.add(R.string.conn_checks_disabled, ConnChecksSetting.VAL_DISABLED);
+    }
+
+    @Override
+    public void addPrefsAfterList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.conn_checks_footer);
+    }
+}
diff --git a/src/com/android/settings/network/GoogleEuiccLpaController.java b/src/com/android/settings/network/GoogleEuiccLpaController.java
new file mode 100644
index 00000000000..d697c3b97f1
--- /dev/null
+++ b/src/com/android/settings/network/GoogleEuiccLpaController.java
@@ -0,0 +1,108 @@
+package com.android.settings.network;
+
+import android.Manifest;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.ext.PackageId;
+import android.os.PowerManager;
+import android.os.UserHandle;
+import android.permission.PermissionManager;
+
+import com.android.settings.R;
+import com.android.settings.ext.AbstractTogglePrefController;
+import com.android.settings.ext.ExtSettingControllerHelper;
+
+import static java.util.Objects.requireNonNull;
+
+public class GoogleEuiccLpaController extends AbstractTogglePrefController {
+    private static final String PKG_NAME = PackageId.G_EUICC_LPA_NAME;
+
+    private final PackageManager packageManager;
+    private final boolean isPresent;
+
+    public GoogleEuiccLpaController(Context context, String key) {
+        super(context, key);
+        packageManager = context.getPackageManager();
+
+        boolean isPresent = false;
+        try {
+            var ai = packageManager.getApplicationInfo(PKG_NAME, 0);
+            isPresent = ai.isSystemApp();
+        } catch (PackageManager.NameNotFoundException ignored) {}
+
+        this.isPresent = isPresent;
+    }
+
+    @Override
+    public boolean isChecked() {
+        try {
+            return isPresent && packageManager.getApplicationInfo(PKG_NAME, 0).enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!isPresent) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return ExtSettingControllerHelper.getGlobalSettingAvailability(mContext);
+    }
+    
+    private void setEnabled(boolean isEnabled) {
+        String pkg = PKG_NAME;
+
+        if (isEnabled) {
+            var permManager = mContext.getSystemService(PermissionManager.class);
+            UserHandle user = mContext.getUser();
+
+            String perm = Manifest.permission.CAMERA;
+            permManager.revokeRuntimePermission(pkg, perm, user, null);
+            // Previously, Camera permission was auto-granted with the FLAG_PERMISSION_SYSTEM_FIXED,
+            // which made it unchangeable by the user.
+            // Removing FLAG_PERMISSION_USER_FIXED is needed to make sure that the app is always
+            // able to show a permission request dialog after being enabled
+            int permFlagsToRemove = PackageManager.FLAG_PERMISSION_SYSTEM_FIXED
+                    | PackageManager.FLAG_PERMISSION_USER_FIXED;
+            permManager.updatePermissionFlags(pkg, perm, permFlagsToRemove, 0, user);
+        }
+
+        var powerManager = requireNonNull(mContext.getSystemService(PowerManager.class));
+
+        int ces = isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+                              PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        packageManager.setApplicationEnabledSetting(pkg, ces, 0);
+
+        // Reboot is required in both cases:
+        // - OS code doesn't expect LPA to become unavailable at runtime and starts to poll for it
+        // with a high frequency
+        // - EuiccGoogle performs initialization in response to "(locked) boot completed" broadcasts
+        // - also, if current boot count is 1 (i.e. if this is the first boot), EuiccGoogle expects to
+        // be interacted with by Google's SetupWizard. Boot count will be at least 2 after reboot.
+        powerManager.reboot(null);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        var b = new AlertDialog.Builder(mContext);
+
+        int msg;
+        int btnText;
+        if (isChecked) {
+            msg = R.string.g_euicc_lpa_enable_dialog_msg;
+            btnText = R.string.g_euicc_lpa_restart_button;
+        } else {
+            b.setTitle(R.string.g_euicc_lpa_disable_dialog_title);
+            msg = R.string.g_euicc_lpa_disable_dialog_msg;
+            btnText = R.string.g_euicc_lpa_proceed_button;
+        }
+
+        b.setMessage(msg);
+        b.setPositiveButton(btnText, (d, btn) -> setEnabled(isChecked));
+        b.show();
+
+        return false;
+    }
+}
diff --git a/src/com/android/settings/network/InternetSetupActivity.java b/src/com/android/settings/network/InternetSetupActivity.java
new file mode 100644
index 00000000000..4e36accb886
--- /dev/null
+++ b/src/com/android/settings/network/InternetSetupActivity.java
@@ -0,0 +1,52 @@
+package com.android.settings.network;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.android.settings.ButtonBarHandler;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SetupWizardUtils;
+
+import com.google.android.setupdesign.util.ThemeHelper;
+
+public class InternetSetupActivity extends SettingsActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        ThemeHelper.trySetDynamicColor(this);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void createUiFromIntent(Bundle savedState, Intent intent) {
+        intent.putExtra("extra_prefs_show_button_bar", false);
+        super.createUiFromIntent(savedState, intent);
+    }
+
+    @Override
+    protected boolean isToolbarEnabled() {
+        // Hide the action bar from this page.
+        return false;
+    }
+
+    private static final String FRAGMENT_CLASS_NAME = NetworkProviderSetup.class.getName();
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, FRAGMENT_CLASS_NAME);
+        return modIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return FRAGMENT_CLASS_NAME.equals(fragmentName);
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index 128b324e492..4f51d115064 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -269,8 +269,8 @@ public class NetworkProviderSettings extends RestrictedDashboardFragment
     /**
      * Mobile networks list for provider model
      */
-    private static final String PREF_KEY_PROVIDER_MOBILE_NETWORK = "provider_model_mobile_network";
-    private NetworkMobileProviderController mNetworkMobileProviderController;
+    static final String PREF_KEY_PROVIDER_MOBILE_NETWORK = "provider_model_mobile_network";
+    NetworkMobileProviderController mNetworkMobileProviderController;
 
     /**
      * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
diff --git a/src/com/android/settings/network/NetworkProviderSetup.java b/src/com/android/settings/network/NetworkProviderSetup.java
new file mode 100644
index 00000000000..ae3c01a70a3
--- /dev/null
+++ b/src/com/android/settings/network/NetworkProviderSetup.java
@@ -0,0 +1,155 @@
+package com.android.settings.network;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupdesign.GlifPreferenceLayout;
+
+/**
+ * UI for Mobile network and Wi-Fi network setup.
+ */
+public class NetworkProviderSetup extends NetworkProviderSettings {
+    public static final String EXTRA_SETUP_WIZARD_MODE_WIFI = "setup_wizard_mode_wifi";
+    public static final String EXTRA_SETUP_WIZARD_TITLE = "setup_wizard_title";
+    public static final String EXTRA_SETUP_WIZARD_DESCRIPTION = "setup_wizard_description";
+    private static final String PREF_KEY_CONNECTED_ETHERNET_NETWORK = "connected_ethernet_network";
+    private static final String EXTRA_PREFS_SET_SKIP_TEXT = "extra_prefs_set_skip_text";
+
+    /**
+     * Don't show media other than wifi, even if they might be available.
+     */
+    private boolean isSetupWizardModeWifi;
+    private FooterButton nextButton;
+    private FooterButton skipButton;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        isSetupWizardModeWifi = getIntent().getBooleanExtra(
+                EXTRA_SETUP_WIZARD_MODE_WIFI, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        Activity activity = getActivity();
+        if (activity == null) return;
+        GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
+        layout.setDividerInsets(Integer.MAX_VALUE, 0);
+        if (isSetupWizardModeWifi) {
+            layout.setIcon(activity.getDrawable(R.drawable.baseline_wifi_glif));
+            Intent intent = activity.getIntent();
+            layout.setHeaderText(intent.getStringExtra(EXTRA_SETUP_WIZARD_TITLE));
+            layout.setDescriptionText(intent.getStringExtra(EXTRA_SETUP_WIZARD_DESCRIPTION));
+        }
+        FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+        // setup next button
+        nextButton = new FooterButton.Builder(activity)
+                .setButtonType(FooterButton.ButtonType.NEXT)
+                .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
+                .setText(R.string.next_label)
+                .build();
+        mixin.setPrimaryButton(nextButton);
+        nextButton.setOnClickListener(v -> finish());
+        // setup skip button
+        skipButton = new FooterButton.Builder(activity)
+                .setButtonType(FooterButton.ButtonType.SKIP)
+                .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
+                .setText(R.string.skip_label)
+                .build();
+        String buttonText = getIntent().getStringExtra(EXTRA_PREFS_SET_SKIP_TEXT);
+        if (!TextUtils.isEmpty(buttonText)) {
+            skipButton.setText(buttonText);
+        }
+        mixin.setSecondaryButton(skipButton);
+        skipButton.setOnClickListener(v -> finish());
+    }
+
+    @Override
+    public void finish() {
+        Activity activity = getActivity();
+        if (activity == null) return;
+        activity.setResult(Activity.RESULT_OK);
+        activity.finish();
+    }
+
+    @Override
+    void changeNextButtonState(boolean enabled) {
+        nextButton.setEnabled(enabled);
+        skipButton.setVisibility(enabled ? View.GONE : View.VISIBLE);
+    }
+
+    @Override
+    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+            Bundle savedInstanceState) {
+        GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
+        return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
+    }
+
+    private static void maybeSetVisible(@Nullable Preference p, boolean visible) {
+        if (p != null) {
+            p.setVisible(visible);
+        }
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        maybeSetVisible(mConfigureWifiSettingsPreference, false);
+        maybeSetVisible(mDataUsagePreference, false);
+        maybeSetVisible(mAirplaneModeMsgPreference, false);
+        maybeSetVisible(mResetInternetPreference, false);
+        if (isSetupWizardModeWifi) {
+            maybeSetVisible(findPreference(PREF_KEY_CONNECTED_ETHERNET_NETWORK), false);
+            maybeSetVisible(findPreference(PREF_KEY_PROVIDER_MOBILE_NETWORK), false);
+            if (mNetworkMobileProviderController != null) {
+                mNetworkMobileProviderController.hidePreference(true, false);
+            }
+        }
+    }
+
+    @Override
+    protected void setProgressBarVisible(boolean visible) {
+        GlifPreferenceLayout glif = (GlifPreferenceLayout) getView();
+        if (glif == null) return;
+        glif.setProgressBarShown(visible);
+    }
+
+    @Override
+    public void setHasOptionsMenu(boolean hasMenu) {
+        // do nothing
+    }
+
+    @Override
+    public void scrollToPreference(String key) {
+        // do nothing
+    }
+
+    @Override
+    public void scrollToPreference(Preference preference) {
+        // do nothing
+    }
+
+    @Override
+    public View setPinnedHeaderView(int layoutResId) {
+        return null; // result unused
+    }
+
+    @Override
+    public void setLoading(boolean loading, boolean animate) {
+        // do nothing
+    }
+}
diff --git a/src/com/android/settings/network/RemoteProvisioningPrefController.java b/src/com/android/settings/network/RemoteProvisioningPrefController.java
new file mode 100644
index 00000000000..8617d6bd98c
--- /dev/null
+++ b/src/com/android/settings/network/RemoteProvisioningPrefController.java
@@ -0,0 +1,36 @@
+/*
+ * 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.network;
+
+import android.content.Context;
+import android.ext.settings.RemoteKeyProvisioningSettings;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+
+public class RemoteProvisioningPrefController extends IntSettingPrefController {
+
+    public RemoteProvisioningPrefController(Context ctx, String key) {
+        super(ctx, key, RemoteKeyProvisioningSettings.SERVER_SETTING);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.remote_provisioning_enabled_grapheneos_proxy, RemoteKeyProvisioningSettings.GRAPHENEOS_PROXY);
+        entries.add(R.string.remote_provisioning_enabled_google_server, RemoteKeyProvisioningSettings.STANDARD_SERVER);
+    }
+}
diff --git a/src/com/android/settings/network/WidevineProvisioningPrefController.java b/src/com/android/settings/network/WidevineProvisioningPrefController.java
new file mode 100644
index 00000000000..09d62f012ac
--- /dev/null
+++ b/src/com/android/settings/network/WidevineProvisioningPrefController.java
@@ -0,0 +1,43 @@
+/*
+ * 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.network;
+
+import android.content.Context;
+import android.ext.settings.WidevineProvisioningSettings;
+
+import com.android.settings.R;
+import androidx.preference.PreferenceScreen;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class WidevineProvisioningPrefController extends IntSettingPrefController {
+
+    public WidevineProvisioningPrefController(Context ctx, String key) {
+        super(ctx, key, WidevineProvisioningSettings.SERVER_SETTING);
+    }
+
+    @Override
+    public void addPrefsAfterList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.widevine_provisioning_footer);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.widevine_provisioning_enabled_grapheneos_proxy, WidevineProvisioningSettings.WV_GRAPHENEOS_PROXY);
+        entries.add(R.string.widevine_provisioning_enabled_google_server, WidevineProvisioningSettings.WV_STANDARD_SERVER);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/CarrierConfigRepository.kt b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
index 77f4e1c277a..3fcadf9982e 100644
--- a/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
+++ b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
@@ -33,7 +33,7 @@ class CarrierConfigRepository(private val context: Context) {
     private val carrierConfigManager: CarrierConfigManager? =
         context.getSystemService(CarrierConfigManager::class.java)
 
-    private enum class KeyType {
+    enum class KeyType {
         BOOLEAN,
         INT,
         INT_ARRAY,
diff --git a/src/com/android/settings/network/telephony/CarrierSettingsOverridesPreferenceController.kt b/src/com/android/settings/network/telephony/CarrierSettingsOverridesPreferenceController.kt
new file mode 100644
index 00000000000..94bf8f67b61
--- /dev/null
+++ b/src/com/android/settings/network/telephony/CarrierSettingsOverridesPreferenceController.kt
@@ -0,0 +1,56 @@
+package com.android.settings.network.telephony
+
+import android.content.Context
+import android.telephony.SubscriptionManager
+import androidx.lifecycle.LifecycleOwner
+import androidx.preference.Preference
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.core.BasePreferenceController
+import com.android.settings.network.telephony.MobileNetworkSettingsSearchIndex.MobileNetworkSettingsSearchItem
+import com.android.settings.network.telephony.MobileNetworkSettingsSearchIndex.MobileNetworkSettingsSearchResult
+import com.android.settings.spa.SpaActivity.Companion.startSpaActivity
+import com.android.settings.network.telephony.carriersettingsoverride.CarrierSettingsOverridesProvider
+
+/** Preference controller for "Carrier settings overrides" */
+class CarrierSettingsOverridesPreferenceController(context: Context, key: String) :
+    BasePreferenceController(context, key) {
+
+    private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+    private lateinit var preference: Preference
+
+    fun init(subId: Int) {
+        this.subId = subId
+    }
+
+    override fun getAvailabilityStatus() = AVAILABLE
+
+    override fun displayPreference(screen: PreferenceScreen) {
+        super.displayPreference(screen)
+        preference = screen.findPreference(preferenceKey)!!
+    }
+
+    override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+        // preference.summary = mContext.getPlaceholder()
+    }
+
+    override fun handlePreferenceTreeClick(preference: Preference): Boolean {
+        if (preference.key != preferenceKey) return false
+        val route = CarrierSettingsOverridesProvider.getRoute(subId)
+        mContext.startSpaActivity(route)
+        return true
+    }
+
+    companion object {
+        class CarrierSettingsOverridesSearchItem(
+            private val context: Context
+        ) : MobileNetworkSettingsSearchItem {
+            override fun getSearchResult(subId: Int): MobileNetworkSettingsSearchResult {
+                return MobileNetworkSettingsSearchResult(
+                    key = "carrier_settings_override_gos",
+                    title = context.getString(R.string.carrier_settings_override_gos_title),
+                )
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 932897ec20d..fcc5f90c35f 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -62,6 +62,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -144,7 +145,7 @@ public EnabledNetworkModePreferenceController(Context context, String key) {
     @Override
     public int getAvailabilityStatus() {
         return getNetworkModePreferenceType(mContext, mSubId)
-                == NetworkModePreferenceType.EnabledNetworkMode
+                != NetworkModePreferenceType.PreferredNetworkMode
                 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
@@ -296,6 +297,7 @@ public static class PreferenceEntriesBuilder {
         private boolean mDisplay2gOptions;
         private boolean mDisplay3gOptions;
         private boolean mLteEnabled;
+        private boolean isNrSaAvailable; // Nr-Sa (5G standalone)
         private int mSelectedEntry;
         private int mSubId;
         private String mSummary;
@@ -364,6 +366,14 @@ public void updateConfig() {
                 }
 
                 mLteEnabled = carrierConfig.getBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL);
+                int[] supported5gOptions = carrierConfig.getIntArray(
+                        CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);
+                isNrSaAvailable = supported5gOptions != null && com.google.common.primitives.Ints.contains(
+                        supported5gOptions,
+                        CarrierConfigManager.CARRIER_NR_AVAILABILITY_SA
+                ) && (mTelephonyManager.getAllowedNetworkTypesForReason(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)
+                        & TelephonyManager.NETWORK_TYPE_BITMASK_NR
+                ) > 0;
             }
             Log.d(LOG_TAG, "PreferenceEntriesBuilder: subId" + mSubId
                     + " ,Supported5gRadioAccessFamily :" + mSupported5gRadioAccessFamily
@@ -385,6 +395,7 @@ private boolean isDisabledByAdmin() {
         }
 
         void setPreferenceEntries() {
+            boolean lteOnlyUnsupported = false;
             mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
 
             clearAllEntries();
@@ -400,6 +411,7 @@ void setPreferenceEntries() {
                             .addFormat(UiOptions.PresentFormat.addGlobalEntry);
                     break;
                 case ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES:
+                    lteOnlyUnsupported = true;
                     uiOptions = uiOptions
                             .setChoices(R.array.enabled_networks_cdma_no_lte_values)
                             .addFormat(UiOptions.PresentFormat.add3gEntry)
@@ -419,6 +431,7 @@ void setPreferenceEntries() {
                             .addFormat(UiOptions.PresentFormat.add2gEntry);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES:
+                    lteOnlyUnsupported = true;
                     uiOptions = uiOptions
                             .setChoices(R.array.enabled_networks_except_gsm_lte_values)
                             .addFormat(UiOptions.PresentFormat.add3gEntry);
@@ -436,6 +449,7 @@ void setPreferenceEntries() {
                             .addFormat(UiOptions.PresentFormat.add3gEntry);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_LTE_CHOICES:
+                    lteOnlyUnsupported = true;
                     uiOptions = uiOptions
                             .setChoices(R.array.enabled_networks_except_lte_values)
                             .addFormat(UiOptions.PresentFormat.add3gEntry)
@@ -484,6 +498,9 @@ void setPreferenceEntries() {
                 throw new IllegalArgumentException(
                         uiOptions.getType().name() + " index error.");
             }
+
+            AtomicBoolean is5GSupported = new AtomicBoolean(false);
+
             // Compose options based on given values and formats.
             IntStream.range(0, formatList.size()).forEach(entryIndex -> {
                 switch (formatList.get(entryIndex)) {
@@ -525,19 +542,33 @@ void setPreferenceEntries() {
                         break;
                     case add5gEntry:
                         add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
+                        is5GSupported.set(true);
                         break;
                     case add5gAnd4gEntry:
                         add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
                         add4gEntry(entryValuesInt[entryIndex]);
+                        is5GSupported.set(true);
                         break;
                     case add5gAndLteEntry:
                         add5gEntry(addNrToLteNetworkMode(entryValuesInt[entryIndex]));
                         addLteEntry(entryValuesInt[entryIndex]);
+                        is5GSupported.set(true);
                         break;
                     default:
                         throw new IllegalArgumentException("Not supported ui options format.");
                 }
             });
+
+            if (!lteOnlyUnsupported) {
+                addLteOnlyEntry();
+            }
+
+            if (!lteOnlyUnsupported && is5GSupported.get()) {
+                addNrOrLteOnlyEntry();
+                if (isNrSaAvailable) {
+                    addNrOnlyEntry();
+                }
+            }
         }
 
         private int getPreferredNetworkMode() {
@@ -667,6 +698,9 @@ void setPreferenceValueAndSummary(int networkMode) {
                         break;
                     }
                 case TelephonyManager.NETWORK_MODE_LTE_ONLY:
+                    setSummary(mShow4gForLTE
+                            ? R.string.network_4G_only : R.string.network_lte_only);
+                    break;
                 case TelephonyManager.NETWORK_MODE_LTE_WCDMA:
                     if (!mIsGlobalCdma) {
                         setSelectedEntry(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
@@ -741,7 +775,17 @@ void setPreferenceValueAndSummary(int networkMode) {
                     break;
 
                 case TelephonyManager.NETWORK_MODE_NR_ONLY:
+                    setSelectedEntry(
+                            TelephonyManager.NETWORK_MODE_NR_ONLY);
+                    setSummary(getResourcesForSubId().getString(R.string.network_5g_only));
+                    break;
                 case TelephonyManager.NETWORK_MODE_NR_LTE:
+                    setSelectedEntry(
+                            TelephonyManager.NETWORK_MODE_NR_LTE);
+                    setSummary(getResourcesForSubId().getString(mShow4gForLTE ?
+                            R.string.network_5g_or_4g_only : R.string.network_5g_or_lte_only)
+                    );
+                    break;
                 case TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA:
                 case TelephonyManager.NETWORK_MODE_NR_LTE_WCDMA:
                     setSelectedEntry(TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA);
@@ -858,6 +902,31 @@ private void add1xEntry(int value) {
             mEntriesValue.add(value);
         }
 
+        private void addLteOnlyEntry() {
+            if (mShow4gForLTE) {
+                mEntries.add(mContext.getString(R.string.network_4G_only));
+                mEntriesValue.add(TelephonyManager.NETWORK_MODE_LTE_ONLY);
+            } else {
+                mEntries.add(mContext.getString(R.string.network_lte_only));
+                mEntriesValue.add(TelephonyManager.NETWORK_MODE_LTE_ONLY);
+            }
+        }
+
+        private void addNrOnlyEntry() {
+            mEntries.add(mContext.getString(R.string.network_5g_only));
+            mEntriesValue.add(TelephonyManager.NETWORK_MODE_NR_ONLY);
+        }
+
+        private void addNrOrLteOnlyEntry() {
+            if (mShow4gForLTE) {
+                mEntries.add(mContext.getString(R.string.network_5g_or_4g_only));
+                mEntriesValue.add(TelephonyManager.NETWORK_MODE_NR_LTE);
+            } else {
+                mEntries.add(mContext.getString(R.string.network_5g_or_lte_only));
+                mEntriesValue.add(TelephonyManager.NETWORK_MODE_NR_LTE);
+            }
+        }
+
         private void addCustomEntry(String name, int value) {
             mEntries.add(name);
             mEntriesValue.add(value);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index b2feb41c63f..5501aedb2bb 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -294,6 +294,7 @@ public void onAttach(Context context) {
 
         use(ApnPreferenceController.class).init(mSubId);
         use(CarrierPreferenceController.class).init(mSubId);
+        use(CarrierSettingsOverridesPreferenceController.class).init(mSubId);
         if (!isCatalystEnabled() || !Flags.deeplinkNetworkAndInternet25q4()) {
             use(DataUsagePreferenceController.class).init(mSubId);
             use(EnabledNetworkModePreferenceController.class)
@@ -620,4 +621,4 @@ private int getSubId() {
         return retSubId;
     }
 }
-// LINT.ThenChange(MobileNetworkScreen.kt)
\ No newline at end of file
+// LINT.ThenChange(MobileNetworkScreen.kt)
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt b/src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt
index 964153c2181..8ae7c52c789 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt
@@ -21,6 +21,7 @@ import android.provider.Settings
 import android.telephony.SubscriptionInfo
 import com.android.settings.R
 import com.android.settings.datausage.BillingCyclePreferenceController.Companion.BillingCycleSearchItem
+import com.android.settings.network.telephony.CarrierSettingsOverridesPreferenceController.Companion.CarrierSettingsOverridesSearchItem
 import com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController.Companion.CarrierSettingsVersionSearchItem
 import com.android.settings.network.telephony.DataUsagePreferenceController.Companion.DataUsageSearchItem
 import com.android.settings.network.telephony.MmsMessagePreferenceController.Companion.MmsMessageSearchItem
@@ -110,6 +111,7 @@ class MobileNetworkSettingsSearchIndex(
         fun createSearchItems(context: Context): List<MobileNetworkSettingsSearchItem> =
             listOf(
                 BillingCycleSearchItem(context),
+                CarrierSettingsOverridesSearchItem(context),
                 CarrierSettingsVersionSearchItem(context),
                 DataUsageSearchItem(context),
                 MmsMessageSearchItem(context),
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 1ee1b31e4dd..d70b1ed8b7e 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -220,7 +220,7 @@ private int getPreferredNetworkModeSummaryResId(int networkMode) {
             case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA:
                 return R.string.preferred_network_mode_lte_tdscdma_summary;
             case TelephonyManager.NETWORK_MODE_LTE_ONLY:
-                return R.string.preferred_network_mode_lte_summary;
+                return R.string.preferred_network_mode_lte_only_summary;
             case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM:
                 return R.string.preferred_network_mode_lte_tdscdma_gsm_summary;
             case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
diff --git a/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierConfigOverrideOptions.kt b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierConfigOverrideOptions.kt
new file mode 100644
index 00000000000..0e5f8d73611
--- /dev/null
+++ b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierConfigOverrideOptions.kt
@@ -0,0 +1,325 @@
+package com.android.settings.network.telephony.carriersettingsoverride
+
+import android.telephony.CarrierConfigManager
+import com.android.settings.R
+import com.android.settings.network.telephony.CarrierConfigRepository.KeyType
+
+/**
+ * This file contains all the possible carrier config override options that will appear in the UI
+ * To add a new option:
+ *
+ * 1. Create a new object subclassing [ChangeableCarrierConfigOption].
+ *    keysWithImportance specifies the keys that will be changed by the option.
+ *    allPossibleConfigStates should enumerate all possible expected states for those keys. The "use
+ *    default" option is added automatically elsewhere. You can mark user-selectable states that
+ *    will be shown to the user; everything is selectable by default. You should also give human-
+ *    readable strings for the options and the option title.
+ *
+ * 2. Add the new class to the allowedUserChangeableCarrierConfigFlags list below. This will allow
+ *    the UI to detect the option and render it.
+ *
+ * 3. Consider bumping the value of MAX_OVERRIDES in SubscriptionManagerService on
+ * frameworks/opt/telephony. TODO: Extract this into a constant that can be read from client code
+ */
+
+private val simpleUniformBoolStates: List<ConfigState> = listOf(
+    ConfigState.Uniform(
+        CarrierConfigTypedValue.Bool(true),
+        R.string.carrier_settings_override_bool_true,
+        R.string.carrier_settings_default_bool_true,
+    ),
+    ConfigState.Uniform(
+        CarrierConfigTypedValue.Bool(false),
+        R.string.carrier_settings_override_bool_false,
+        R.string.carrier_settings_default_bool_false,
+        isUserSelectable = false,
+    ),
+)
+
+// Add new options here so that the UI can display it
+val allowedUserChangeableCarrierConfigOptions: List<ChangeableCarrierConfigOption> by lazy {
+    listOf(
+
+        VoLTEAvailable,
+        VoNREnabled,
+        Enable5G,
+        WiFiCallingAvailable,
+        CrossSIMAvailable
+
+    ).also { list ->
+       list.onEach { flag ->
+            flag.possibleConfigStates.forEach { state ->
+                if (state is ConfigState.NonUniform) {
+                    val left = state.stateValues.size
+                    val right = flag.keys.size
+                    check(left == right) {
+                        "key size for ${flag.javaClass.simpleName} mismatch ($left != $right)"
+                    }
+
+                    if (state.stateValues.any { it is CarrierConfigTypedValue.AnyMatcher }) {
+                        check(!state.isUserSelectable) {
+                            "States with AnyMatcher should not be selectable"
+                        }
+                    }
+                }
+
+            }
+        }
+        val numTotalKeys = list.sumOf { it.keys.size }
+        val max = 25
+        check(numTotalKeys <= max) {
+            "numTotalKeys $numTotalKeys exceeds max number of overrides $max"
+        }
+    }
+}
+
+data object VoLTEAvailable : ChangeableCarrierConfigOption(
+    // The keys that will be edited in this option
+    keysWithType = listOf(
+        CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL to KeyType.BOOLEAN,
+    ),
+    // All possible values for the keys. Each of these can be an option that the user can select
+    allPossibleConfigStates = listOf(
+        // Enabled
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true), // KEY_CARRIER_VOLTE_AVAILABLE_BOOL
+                CarrierConfigTypedValue.Bool(false), // KEY_HIDE_ENHANCED_4G_LTE_BOOL
+            ),
+            R.string.carrier_settings_override_bool_true,
+            R.string.carrier_settings_default_bool_true,
+        ),
+        // Disabled
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(false),
+                CarrierConfigTypedValue.Bool(true),
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+
+        // Other states not exposed for user selection just so that we have a description for them
+        // Disabled
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(false),
+                CarrierConfigTypedValue.Bool(false),
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+        // Disabled
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true),
+                CarrierConfigTypedValue.Bool(true),
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+    )
+) {
+    override val titleStringRes = R.string.carrier_settings_override_volte_availability
+    override val dialogDescriptionStringRes =
+        R.string.carrier_settings_override_volte_availability_description
+}
+
+data object VoNREnabled : ChangeableCarrierConfigOption(
+    keysWithType = listOf(
+        CarrierConfigManager.KEY_VONR_ENABLED_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL to KeyType.BOOLEAN,
+    ),
+    // Use uniform booleans (true true, false false), then cover other states not exposed for user
+    // selection just so that we have a description for them
+    allPossibleConfigStates = simpleUniformBoolStates + listOf(
+        // Not exposed for user
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true),
+                CarrierConfigTypedValue.Bool(false),
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(false),
+                CarrierConfigTypedValue.Bool(true),
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+    )
+) {
+    override val titleStringRes = R.string.carrier_settings_override_vonr_enable
+    override val dialogDescriptionStringRes =
+        R.string.carrier_settings_override_vonr_enable_description
+}
+
+data object Enable5G : ChangeableCarrierConfigOption(
+    keysWithType = listOf(
+        CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY to KeyType.INT_ARRAY,
+    ),
+    allPossibleConfigStates = listOf(
+        // Enabled (i.e. all the 5G NR capabilities)
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.IntegerArray(
+                listOf(
+                    CarrierConfigManager.CARRIER_NR_AVAILABILITY_NSA,
+                    CarrierConfigManager.CARRIER_NR_AVAILABILITY_SA,
+                )
+            ),
+            R.string.carrier_settings_override_5g_enabled_all_modes,
+            R.string.carrier_settings_override_5g_default_all_modes,
+        ),
+        // Only NSA
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.IntegerArray(
+                listOf(CarrierConfigManager.CARRIER_NR_AVAILABILITY_NSA)
+            ),
+            R.string.carrier_settings_override_5g_enabled_nsa,
+            R.string.carrier_settings_override_5g_default_nsa,
+            isUserSelectable = false,
+        ),
+        // Only SA
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.IntegerArray(
+                listOf(CarrierConfigManager.CARRIER_NR_AVAILABILITY_SA)
+            ),
+            R.string.carrier_settings_override_5g_enabled_sa,
+            R.string.carrier_settings_override_5g_default_sa,
+            isUserSelectable = false,
+        ),
+        // Disabled (i.e. no 5G NR capabilities)
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.IntegerArray(emptyList()),
+            R.string.carrier_settings_override_5g_disabled,
+            R.string.carrier_settings_default_5g_disabled,
+            isUserSelectable = false,
+        ),
+    )
+) {
+    override val titleStringRes = R.string.carrier_settings_override_5g_title
+    override val dialogDescriptionStringRes = R.string.carrier_settings_override_5g_description
+}
+
+data object WiFiCallingAvailable : ChangeableCarrierConfigOption(
+    // The keys that will be edited in this option
+    keysWithType = listOf(
+        CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL to KeyType.BOOLEAN,
+    ),
+    allPossibleConfigStates = listOf(
+        // Enabled
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.Bool(true),
+            R.string.carrier_settings_override_bool_true,
+            R.string.carrier_settings_default_bool_true,
+            summaryStringRes = R.string.carrier_settings_override_wfc_availability_on_summary
+        ),
+        // Not exposed for user. All of these are used to match with original carrier config values
+        // Disabled
+        ConfigState.Uniform(
+            CarrierConfigTypedValue.Bool(false),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true), // KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL
+                CarrierConfigTypedValue.Bool(true), // KEY_EDITABLE_WFC_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL
+                CarrierConfigTypedValue.Bool(false), // KEY_EDITABLE_WFC_ROAMING_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL
+            ),
+            R.string.carrier_settings_override_wfc_availability_enabled_roaming_not_editable,
+            R.string.carrier_settings_override_wfc_availability_enabled_roaming_not_editable,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true), // KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL
+                CarrierConfigTypedValue.Bool(true), // KEY_EDITABLE_WFC_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_EDITABLE_WFC_ROAMING_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL
+            ),
+            R.string.carrier_settings_override_bool_true,
+            R.string.carrier_settings_default_bool_true,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true), // KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL
+                CarrierConfigTypedValue.Bool(false), // KEY_EDITABLE_WFC_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_EDITABLE_WFC_ROAMING_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL
+            ),
+            R.string.carrier_settings_override_wfc_availability_enabled_not_editable,
+            R.string.carrier_settings_override_wfc_availability_enabled_not_editable,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(false), // KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_EDITABLE_WFC_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_EDITABLE_WFC_ROAMING_MODE_BOOL
+                CarrierConfigTypedValue.AnyMatcher, // KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+    )
+) {
+    override val titleStringRes = R.string.carrier_settings_override_wfc_availability
+    override val dialogDescriptionStringRes =
+        R.string.carrier_settings_override_wfc_availability_description
+}
+
+data object CrossSIMAvailable : ChangeableCarrierConfigOption(
+    keysWithType = listOf(
+        CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL to KeyType.BOOLEAN,
+        CarrierConfigManager.KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL to KeyType.BOOLEAN,
+    ),
+    // Use uniform booleans (true true, false false), then cover other states not exposed for user
+    // selection just so that we have a description for them
+    allPossibleConfigStates = simpleUniformBoolStates + listOf(
+        // Not exposed for user
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(false),
+                CarrierConfigTypedValue.AnyMatcher,
+            ),
+            R.string.carrier_settings_override_bool_false,
+            R.string.carrier_settings_default_bool_false,
+            isUserSelectable = false,
+        ),
+        ConfigState.NonUniform(
+            listOf(
+                CarrierConfigTypedValue.Bool(true),
+                CarrierConfigTypedValue.AnyMatcher,
+            ),
+            R.string.carrier_settings_override_bool_true,
+            R.string.carrier_settings_default_bool_true,
+            isUserSelectable = false,
+        ),
+    )
+) {
+    override val titleStringRes = R.string.carrier_settings_override_cross_sim
+    override val dialogDescriptionStringRes: Int
+        get() = R.string.carrier_settings_override_cross_sim_description
+}
diff --git a/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesProvider.kt b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesProvider.kt
new file mode 100644
index 00000000000..97593efba40
--- /dev/null
+++ b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesProvider.kt
@@ -0,0 +1,367 @@
+package com.android.settings.network.telephony.carriersettingsoverride
+
+import android.app.settings.SettingsEnums
+import android.content.Context
+import android.os.Bundle
+import android.os.UserManager
+import android.util.ArrayMap
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material.icons.outlined.Warning
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import com.android.settings.R
+import com.android.settings.network.telephony.carriersettingsoverride.CarrierSettingsOverridesViewModel.MessageType
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.theme.SettingsDimension
+import com.android.settingslib.spa.widget.dialog.SettingsDialog
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import com.android.settingslib.spa.widget.preference.TopIntroPreference
+import com.android.settingslib.spa.widget.preference.TopIntroPreferenceModel
+import com.android.settingslib.spa.widget.scaffold.RegularScaffold
+import com.android.settingslib.spa.widget.ui.Category
+import com.android.settingslib.spa.widget.ui.Footer
+import com.android.settingslib.spa.widget.ui.SettingsBody
+import com.android.settingslib.spa.widget.ui.SettingsDialogItem
+import com.android.settingslib.spa.widget.ui.SettingsIcon
+import com.android.settingslib.spaprivileged.model.enterprise.Restrictions
+import com.android.settingslib.spaprivileged.template.preference.RestrictedMainSwitchPreference
+import com.android.settingslib.spaprivileged.template.preference.RestrictedPreference
+
+private const val SUB_ID_FOR_OVERRIDE = "subId"
+
+object CarrierSettingsOverridesProvider : SettingsPageProvider {
+    override val name = "CarrierSettingsOverridesProvider"
+    override val metricsCategory = SettingsEnums.MOBILE_NETWORK
+
+    override val parameter = listOf(
+        navArgument(SUB_ID_FOR_OVERRIDE) { type = NavType.IntType },
+    )
+
+    @Composable
+    override fun Page(arguments: Bundle?) {
+        val subId = arguments!!.getInt(com.android.settings.network.apn.SUB_ID)
+        val context = LocalContext.current
+        val viewModel = viewModel<CarrierSettingsOverridesViewModel>()
+        LaunchedEffect(subId) {
+            viewModel.init(subId)
+        }
+
+        val isOverrideInProgress by viewModel.isOverrideInProgress.collectAsStateWithLifecycle()
+        val isOverrideActive by viewModel.isAnOverrideActive.collectAsStateWithLifecycle()
+
+        RegularScaffold(title = stringResource(R.string.carrier_settings_override_gos_title)) {
+            TopIntroPreference(model = object : TopIntroPreferenceModel {
+                override val text = stringResource(R.string.carrier_settings_override_intro_text)
+                override val expandText = stringResource(R.string.carrier_settings_override_intro_text_expand)
+                override val collapseText = stringResource(R.string.carrier_settings_override_intro_text_collapse)
+                override val alwaysExpand = true
+                override val labelText: Int? = null
+            })
+
+            RestrictedMainSwitchPreference(
+                model = object : SwitchPreferenceModel {
+                    override val title = stringResource(R.string.carrier_settings_override_main_switch_title)
+                    override val changeable = { !isOverrideInProgress }
+                    override val checked = { isOverrideActive }
+                    override val onCheckedChange: (Boolean) -> Unit = { _ ->
+                        viewModel.submitOverrides(clearOverrides = isOverrideActive)
+                    }
+                },
+                restrictions = Restrictions(keys = listOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS))
+            )
+
+            Category {
+                val message by viewModel.message.collectAsStateWithLifecycle(null)
+                AnimatedContent(
+                    targetState = message,
+                    transitionSpec = {
+                        // Make it fade / slide in from top and vice versa
+                        (fadeIn(tween(200)) + expandVertically()) togetherWith
+                                (fadeOut(tween(150)) + shrinkVertically())
+                    },
+                    label = "errorPref"
+                ) { msg ->
+                    when (msg) {
+                        is MessageType.ErrorMessage -> {
+                            CompositionLocalProvider(
+                                LocalContentColor provides MaterialTheme.colorScheme.error
+                            ) {
+                                Preference(
+                                    model = object : PreferenceModel {
+                                        override val title = msg.title
+                                            ?: stringResource(
+                                                R.string.carrier_settings_override_error_title
+                                            )
+                                        override val summary: () -> String = { msg.msg }
+                                        override val icon = @Composable {
+                                            SettingsIcon(imageVector = Icons.Outlined.Info)
+                                        }
+                                    }
+                                )
+                            }
+                        }
+                        MessageType.TurnOffToEdit -> {
+                            Preference(
+                                model = object : PreferenceModel {
+                                    override val title = stringResource(
+                                        R.string.carrier_settings_override_active_title
+                                    )
+                                    override val summary: () -> String = {
+                                        context.getString(
+                                            R.string.carrier_settings_override_active_summary
+                                        )
+                                    }
+                                    override val icon = @Composable {
+                                        SettingsIcon(imageVector = Icons.Outlined.Info)
+                                    }
+                                }
+                            )
+                        }
+                        null -> {}
+                    }
+                }
+
+                viewModel.overrideStates.forEach { flagState: CarrierConfigState ->
+                    CarrierSettingOverrideOptionPreference(
+                        flagState,
+                        context,
+                        isOverrideInProgress,
+                        isOverrideActive
+                    )
+                }
+            }
+
+            val unrecognizedOverrides by viewModel.unrecognizedOverrides
+                .collectAsStateWithLifecycle()
+            if (!unrecognizedOverrides.isNullOrEmpty()) {
+                Category(stringResource(R.string.carrier_settings_override_unrecognized_category_title)) {
+                    CompositionLocalProvider(
+                        LocalContentColor provides MaterialTheme.colorScheme.error
+                    ) {
+                        Preference(
+                            model = object : PreferenceModel {
+                                override val title = stringResource(
+                                    R.string.carrier_settings_override_unrecognized_warning_title
+                                )
+                                override val summary: () -> String = {
+                                    context.getString(
+                                        R.string.carrier_settings_override_unrecognized_warning_summary
+                                    )
+                                }
+                                override val icon = @Composable {
+                                    SettingsIcon(imageVector = Icons.Outlined.Warning)
+                                }
+                            }
+                        )
+                    }
+
+                    unrecognizedOverrides?.forEachInline { key, value ->
+                        Preference(
+                            model = object : PreferenceModel {
+                                override val title = key
+                                override val summary: () -> String = {
+                                    if (value is Array<*>) {
+                                        value.asList().toString()
+                                    } else {
+                                        value.toString()
+                                    }
+                                }
+                                override val icon = @Composable {
+                                    SettingsIcon(imageVector = Icons.Outlined.Warning)
+                                }
+                            }
+                        )
+                    }
+                }
+            }
+
+            Footer(stringResource(R.string.carrier_settings_override_footer))
+        }
+    }
+
+    fun getRoute(subId: Int): String = "${name}/$subId"
+}
+
+private inline fun <K, V> ArrayMap<K, V>.forEachInline(action: (K, V) -> Unit) {
+    for (index in 0 until size) {
+        action(keyAt(index), valueAt(index))
+    }
+}
+
+@Composable
+private fun CarrierSettingOverrideOptionPreference(
+    flagState: CarrierConfigState,
+    context: Context,
+    isOverrideInProgress: Boolean,
+    isOverrideActive: Boolean
+) {
+    val selectedIndexForThisFlag by flagState.stateIndex
+    val currentState: ConfigState? = remember(selectedIndexForThisFlag) {
+        selectedIndexForThisFlag?.let { flagState.key.possibleConfigStates[it] }
+    }
+
+    var dialogOpened by rememberSaveable { mutableStateOf(false) }
+    if (dialogOpened) {
+        SettingsDialog(
+            title = stringResource(flagState.key.titleStringRes),
+            onDismissRequest = { dialogOpened = false },
+        ) {
+            Column(
+                modifier = Modifier.selectableGroup().verticalScroll(
+                    rememberScrollState()
+                )
+            ) {
+                flagState.key.dialogDescriptionStringRes?.let { strRes ->
+                    Text(
+                        modifier = Modifier.fillMaxWidth()
+                            .padding(SettingsDimension.dialogItemPadding),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        style = MaterialTheme.typography.bodyMedium,
+                        text = stringResource(strRes)
+                    )
+                }
+                val allStates = flagState.key.possibleConfigStates
+                allStates.forEachIndexed { index, possibleState ->
+                    if (!possibleState.isUserSelectable) return@forEachIndexed
+                    Radio(
+                        text = getSelectionText(context, flagState, possibleState),
+                        summary = (possibleState as? ConfigState.ActiveState)
+                            ?.summaryStringRes
+                            ?.let(context::getString),
+                        selected = index == selectedIndexForThisFlag,
+                        enabled = !isOverrideInProgress && !isOverrideActive,
+                        onSelected = {
+                            flagState.stateIndex.value = index
+                            dialogOpened = false
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    RestrictedPreference(
+        model = object : PreferenceModel {
+            override val title = context.getString(flagState.key.titleStringRes)
+            override val summary = {
+                getSelectionText(context, flagState, currentState)
+            }
+            override val icon = null
+            override val enabled = { !isOverrideInProgress && !isOverrideActive }
+            override val onClick = {
+                if (enabled()) dialogOpened = true
+            }
+        },
+        restrictions = Restrictions(keys = listOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)),
+    )
+}
+
+private fun getSelectionText(
+    context: Context,
+    flagState: CarrierConfigState,
+    stateToDisplay: ConfigState?,
+): String {
+    return when (stateToDisplay) {
+        is ConfigState.ActiveState -> {
+            context.getString(stateToDisplay.selectionStringRes)
+        }
+        ConfigState.Inactive, null -> {
+            val active = flagState.getConfigStateFromIndex(useIndexOfCurrentConfigValue = true)
+                as? ConfigState.ActiveState
+            if (flagState.isOverriddenBefore.value) {
+                // Show as an overridden summary if the current state is from overridden config
+                // e.g. it will show "Force enabled"
+                active
+                    ?.selectionStringRes
+                    ?.let(context::getString)
+                    ?: context.getString(R.string.carrier_settings_default_unknown)
+            } else {
+                // Show as a default-value summary if the current state is not from overridden config
+                // e.g. it will show "Default (Enabled)"
+                val existingValString = active
+                    ?.existingValueStringRes
+                    ?.let(context::getString)
+                    ?: context.getString(R.string.carrier_settings_default_unknown)
+
+                context.getString(R.string.carrier_settings_override_default__s, existingValString)
+            }
+        }
+    }
+}
+
+/**
+ * Adapted from com.android.settingslib.spa.widget.preference.ListPreference
+ */
+@Composable
+private fun Radio(
+    text: String,
+    summary: String? = null,
+    selected: Boolean,
+    enabled: Boolean,
+    modifier: Modifier = Modifier,
+    onSelected: () -> Unit,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .selectable(
+                selected = selected,
+                enabled = enabled,
+                onClick = { onSelected() },
+                role = Role.RadioButton,
+            )
+            .padding(SettingsDimension.dialogItemPadding),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        RadioButton(selected = selected, onClick = null, enabled = enabled)
+        Spacer(modifier = Modifier.width(SettingsDimension.itemPaddingEnd))
+        Column {
+            SettingsDialogItem(text = text, enabled = enabled)
+            if (summary?.isNotEmpty() == true) {
+                SettingsBody(
+                    body = summary,
+                    maxLines = 2
+                )
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesState.kt b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesState.kt
new file mode 100644
index 00000000000..6607d368642
--- /dev/null
+++ b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesState.kt
@@ -0,0 +1,346 @@
+package com.android.settings.network.telephony.carriersettingsoverride
+
+import android.annotation.StringRes
+import android.os.PersistableBundle
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.mutableStateOf
+import com.android.settings.network.telephony.CarrierConfigRepository
+import com.android.settings.network.telephony.CarrierConfigRepository.KeyType
+
+private const val TAG = "CarrierSetOverrideState"
+
+// See CarrierConfigOverrideOptions to add more options
+
+/**
+ * A class that represents a specific state for a carrier config override option. The state may
+ * be selectable or not by the user.
+ *
+ * e.g. for boolean flags, you would have [ConfigState] instance for "Enabled" which specifies
+ * the carrier config flag values for "Enabled", and another [ConfigState] for "Disabled" with its
+ * own flag values.
+ */
+@Immutable
+sealed class ConfigState {
+    /**
+     * Indicates the state where the override is not active.
+     */
+    data object Inactive : ConfigState() {
+        override val isUserSelectable: Boolean get() = true
+        override fun get(index: Int): CarrierConfigTypedValue? = null
+        override fun insertIntoBundle(keys: List<String>, bundle: PersistableBundle) {}
+        override fun testMatching(
+            key: String,
+            keyIndex: Int,
+            config: PersistableBundle,
+            overrideConfig: PersistableBundle
+        ): Boolean {
+            return !overrideConfig.containsKey(key)
+        }
+    }
+
+    /**
+     * Indicates a state where the override is active.
+     */
+    sealed class ActiveState : ConfigState() {
+        @get:StringRes abstract val selectionStringRes: Int
+        @get:StringRes abstract val existingValueStringRes: Int
+        @get:StringRes abstract val summaryStringRes: Int?
+    }
+
+    /**
+     * Whether this state can be selected by the user in the UI or just something we display if
+     * the default values are set to this state.
+     */
+    abstract val isUserSelectable: Boolean
+
+    data class Uniform(
+        val valueForAllKeys: CarrierConfigTypedValue,
+        @get:StringRes override val selectionStringRes: Int,
+        @get:StringRes override val existingValueStringRes: Int,
+        @get:StringRes override val summaryStringRes: Int? = null,
+        override val isUserSelectable: Boolean = true
+    ) : ActiveState() {
+        override fun get(index: Int): CarrierConfigTypedValue = valueForAllKeys
+        override fun insertIntoBundle(keys: List<String>, bundle: PersistableBundle) {
+            keys.forEach{ key ->
+                doInsertion(valueForAllKeys, bundle, key)
+            }
+        }
+
+        override fun testMatching(
+            key: String,
+            keyIndex: Int,
+            config: PersistableBundle,
+            overrideConfig: PersistableBundle
+        ): Boolean {
+            return valueForAllKeys.matchesValue(key, config)
+        }
+    }
+
+    /**
+     *  For when a set of flags have different values per setting. size of [stateValues] is
+     *  expected to be the same as the size of the keys list.
+     */
+    data class NonUniform(
+        val stateValues: List<CarrierConfigTypedValue>,
+        @get:StringRes override val selectionStringRes: Int,
+        @get:StringRes override val existingValueStringRes: Int,
+        @get:StringRes override val summaryStringRes: Int? = null,
+        override val isUserSelectable: Boolean = true
+    ) : ActiveState() {
+        override fun get(index: Int): CarrierConfigTypedValue = stateValues[index]
+        override fun insertIntoBundle(keys: List<String>, bundle: PersistableBundle) {
+            keys.forEachIndexed { index, key -> doInsertion(stateValues[index], bundle, key) }
+        }
+
+        override fun testMatching(
+            key: String,
+            keyIndex: Int,
+            config: PersistableBundle,
+            overrideConfig: PersistableBundle
+        ): Boolean {
+            val typedValue = stateValues[keyIndex]
+            return typedValue.matchesValue(key, config)
+        }
+
+    }
+
+    abstract operator fun get(index: Int): CarrierConfigTypedValue?
+
+    abstract fun insertIntoBundle(keys: List<String>, bundle: PersistableBundle)
+
+    protected abstract fun testMatching(
+        key: String,
+        keyIndex: Int,
+        config: PersistableBundle,
+        overrideConfig: PersistableBundle
+    ): Boolean
+
+    /**
+     * Determines whether the values in [config] and [overrideConfig] match with this particular
+     * config state.
+     */
+    fun isMatchingConfig(
+        keys: List<String>,
+        subsetKeyIndices: List<Int>,
+        config: PersistableBundle,
+        overrideConfig: PersistableBundle
+    ): Boolean {
+        subsetKeyIndices.forEach { index ->
+            val key = keys[index]
+            if (!testMatching(key, index, config, overrideConfig)) {
+                return false
+            }
+        }
+        return true
+    }
+
+    fun doInsertion(
+        stateVal: CarrierConfigTypedValue,
+        bundle: PersistableBundle,
+        key: String,
+    ) {
+        when (stateVal) {
+            is CarrierConfigTypedValue.Bool ->
+                stateVal.currentValue?.let { bundle.putBoolean(key, it) }
+            is CarrierConfigTypedValue.Integer ->
+                stateVal.currentValue?.let { bundle.putInt(key, it) }
+            is CarrierConfigTypedValue.IntegerArray ->
+                stateVal.currentValue?.let { bundle.putIntArray(key, it.toIntArray()) }
+            is CarrierConfigTypedValue.Str ->
+                stateVal.currentValue?.let { bundle.putString(key, it) }
+            CarrierConfigTypedValue.AnyMatcher -> {}
+        }
+    }
+}
+
+/**
+ * Specifies a user-facing option for a set of carrier config flags
+ *
+ * @param keysWithType specifies the keys for the config flags that will be edited by this u
+ * @param allPossibleConfigStates specifies all the possible values for this option.
+ * For example, for 5G, you would need to do FLAG_ENABLED and FLAG_UI_ENABLED. So the possible
+ * options would be:
+ *  - FLAG_ENABLED and FLAG_UI_ENABLED: "Enabled"
+ *  - !FLAG_ENABLED and !FLAG_UI_ENABLED: "Disabled"
+ * And we can consider all other options as disabled.
+ */
+@Stable
+sealed class ChangeableCarrierConfigOption(
+    keysWithType: List<Pair<String, KeyType>>,
+    allPossibleConfigStates: List<ConfigState>,
+) {
+    @get:StringRes
+    abstract val titleStringRes: Int
+
+    @get:StringRes
+    abstract val dialogDescriptionStringRes: Int?
+
+    /**
+     * List of all possible config states including disabled.
+     */
+    val possibleConfigStates: List<ConfigState> = allPossibleConfigStates + listOf(ConfigState.Inactive)
+
+    val keys: List<String> = keysWithType.map { it.first }
+    val types: List<KeyType> = keysWithType.map { it.second }
+
+    fun findMatchingConfigStateIndex(
+        currentConfig: PersistableBundle,
+        activeOverrides: PersistableBundle
+    ): Int? {
+        Log.d(TAG, "findMatchingConfigStateIndex for ${this.javaClass.simpleName}")
+        require(possibleConfigStates.last() is ConfigState.Inactive)
+        require(possibleConfigStates.isNotEmpty())
+
+        // Note that the current config values already include the active overrides
+        val indicesOfKeysInConfig: List<Int> = keys.asSequence()
+            .withIndex()
+            .filter { currentConfig.containsKey(it.value) }
+            .map { it.index }
+            .toList()
+
+        Log.d(TAG, "indicesOfKeysInConfig: $indicesOfKeysInConfig")
+        if (indicesOfKeysInConfig.isEmpty()) {
+            // Match to the disabled option
+            return possibleConfigStates.indices.last
+        }
+
+        return possibleConfigStates.asSequence()
+            .withIndex()
+            .filter {
+                it.value.isMatchingConfig(
+                    keys, indicesOfKeysInConfig, currentConfig, activeOverrides
+                )
+            }
+            .map { it.index }
+            .firstOrNull()
+    }
+}
+
+@Immutable
+sealed class CarrierConfigTypedValue {
+    abstract val currentValue: Any?
+    fun matchesValue(key: String, bundle: PersistableBundle): Boolean {
+        if (!bundle.containsKey(key)) {
+            return currentValue == null
+        }
+        return matchesValueInner(key, bundle)
+    }
+    protected abstract fun matchesValueInner(key: String, bundle: PersistableBundle): Boolean
+    data class Bool(
+        override val currentValue: Boolean?,
+    ) : CarrierConfigTypedValue() {
+        override fun matchesValueInner(key: String, bundle: PersistableBundle) =
+            bundle.getBoolean(key) == currentValue
+    }
+
+    /**
+     * Used in non-selectable states to match against any value from the original carrier config.
+     */
+    data object AnyMatcher : CarrierConfigTypedValue() {
+        override val currentValue: Boolean?
+            get() = null
+
+        override fun matchesValueInner(key: String, bundle: PersistableBundle) = true
+    }
+    data class Str(
+        override val currentValue: String?,
+    ) : CarrierConfigTypedValue() {
+        override fun matchesValueInner(key: String, bundle: PersistableBundle) =
+            bundle.getString(key) == currentValue
+    }
+    data class Integer(
+        override val currentValue: Int?,
+    ) : CarrierConfigTypedValue() {
+        override fun matchesValueInner(key: String, bundle: PersistableBundle) =
+            bundle.getInt(key) == currentValue
+    }
+    data class IntegerArray(
+        // represent as a List (zero-copy representation of array in Kotlin) for hashcode/equals
+        override val currentValue: List<Int>?,
+    ) : CarrierConfigTypedValue() {
+        override fun matchesValueInner(key: String, bundle: PersistableBundle) =
+            bundle.getIntArray(key)?.asList() == currentValue
+    }
+}
+
+/**
+ * UI-facing state for a specific carrier config override option. e.g., we would have an instance
+ * of this to store state for VoLTE overrides, and another instance for VoNR state.
+ *
+ * Stores info such as which state is selected and whether this state value is from an overridden
+ * value.
+ */
+@Stable
+data class CarrierConfigState(
+    /**
+     * The specific option. This stores all possible states for the option, along with some string
+     * resources to display in the UI, etc.
+     */
+    val key: ChangeableCarrierConfigOption,
+    /**
+     * An index to the state prior to entering the carrier config overrides screen, i.e. the
+     * existing state
+     */
+    val indexOfValueBefore: Int?,
+    /**
+     * An index to the current selection for this carrier config override option
+     */
+    val stateIndex: MutableState<Int?> = mutableStateOf(null),
+    /**
+     * Whether this carrier config option is from an active override. If this is true, we expect
+     * that this state can't be changed until all overrides are removed.
+     */
+    val isOverriddenBefore: MutableState<Boolean> = mutableStateOf(false),
+) {
+    fun getConfigStateFromIndex(useIndexOfCurrentConfigValue: Boolean = false): ConfigState? {
+        val index = if (useIndexOfCurrentConfigValue) {
+            indexOfValueBefore
+        } else {
+            stateIndex.value
+        }
+        return index?.let { key.possibleConfigStates[index] }
+    }
+
+    companion object {
+        fun createState(
+            subId: Int,
+            repo: CarrierConfigRepository,
+            flag: ChangeableCarrierConfigOption,
+            activeOverride: PersistableBundle
+        ): CarrierConfigState {
+            val currentAsBundle: PersistableBundle = repo.transformConfig(subId) {
+                val bundle = PersistableBundle()
+                flag.keys.forEachIndexed { index, key ->
+                    val type = flag.types[index]
+                    when (type) {
+                        KeyType.BOOLEAN -> bundle.putBoolean(key, getBoolean(key))
+                        KeyType.INT -> bundle.putInt(key, getInt(key))
+                        KeyType.INT_ARRAY -> bundle.putIntArray(key, getIntArray(key))
+                        KeyType.STRING -> bundle.putString(key, getString(key))
+                    }
+                }
+                bundle
+            }
+
+            Log.d(TAG, "currentAsBundle: $currentAsBundle")
+
+            val indexOfClosestMatch = flag.findMatchingConfigStateIndex(currentAsBundle, activeOverride)
+
+            val isOverridden = !activeOverride.isEmpty &&
+                    flag.keys.any { key -> activeOverride.containsKey(key) }
+            // Set this so that when entering back into the screen with an override active, the
+            // corresponding options gets selected
+            val index: Int? = if (isOverridden) indexOfClosestMatch else null
+            return CarrierConfigState(
+                key = flag,
+                indexOfValueBefore = indexOfClosestMatch,
+                stateIndex = mutableStateOf(index),
+                isOverriddenBefore = mutableStateOf(isOverridden)
+            )
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesViewModel.kt b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesViewModel.kt
new file mode 100644
index 00000000000..3cdc7e123a8
--- /dev/null
+++ b/src/com/android/settings/network/telephony/carriersettingsoverride/CarrierSettingsOverridesViewModel.kt
@@ -0,0 +1,290 @@
+package com.android.settings.network.telephony.carriersettingsoverride
+
+import android.app.Application
+import android.os.PersistableBundle
+import android.os.RemoteException
+import android.telephony.CarrierConfigManager
+import android.telephony.SubscriptionManager
+import android.util.ArrayMap
+import android.util.Log
+import androidx.compose.runtime.mutableStateListOf
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
+import androidx.lifecycle.viewModelScope
+import com.android.settings.R
+import com.android.settings.network.telephony.CarrierConfigRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.async
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+
+private const val TAG = "CarriSettOverridVM"
+
+class CarrierSettingsOverridesViewModel(application: Application) : AndroidViewModel(application) {
+    private val carrierConfigRepo = CarrierConfigRepository(application)
+    private val carrierConfigManager: CarrierConfigManager =
+        application.getSystemService(CarrierConfigManager::class.java)!!
+
+    private fun carrierConfigChanges(subId: Int): Flow<Unit> = callbackFlow {
+        val manager = carrierConfigManager
+
+        val executor = Dispatchers.Default.asExecutor()
+        val listener = CarrierConfigManager.CarrierConfigChangeListener { _, subscriptionId, _, _ ->
+            if (subscriptionId == subId) {
+                trySend(Unit)
+            }
+        }
+
+        Log.d(TAG, "registering config listener")
+        manager.registerCarrierConfigChangeListener(executor, listener)
+        awaitClose {
+            Log.d(TAG, "unregistering config listener")
+            manager.unregisterCarrierConfigChangeListener(listener)
+        }
+    }.conflate()
+
+    private val subId = MutableStateFlow(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+
+    private val carrierConfigUpdatePing: SharedFlow<Unit> =
+        subId
+            .filter { it != SubscriptionManager.INVALID_SUBSCRIPTION_ID }
+            .flatMapLatest { sid -> carrierConfigChanges(sid) }
+            .shareIn(
+                scope = viewModelScope,
+                started = SharingStarted.Lazily,
+                replay = 0
+            )
+
+    private val _overrideStates = mutableStateListOf<CarrierConfigState>()
+    val overrideStates: List<CarrierConfigState>
+        get() = _overrideStates
+
+    /**
+     * Whether the SIM is currently using an active override
+     */
+    private val _isAnOverrideActive = MutableStateFlow(false)
+    val isAnOverrideActive: StateFlow<Boolean> = _isAnOverrideActive
+
+    private var isInitialized = false
+
+    fun init(subId: Int) {
+        if (isInitialized) return
+
+        this.subId.update { oldSubId ->
+            if (oldSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                subId
+            } else {
+                return
+            }
+        }
+        viewModelScope.launch(Dispatchers.Default) {
+            reloadFromCarrierConfig()
+
+            isInitialized = true
+        }
+    }
+
+    private val _unrecognizedOverrides = MutableStateFlow<ArrayMap<String, Any?>?>(null)
+    val unrecognizedOverrides: StateFlow<ArrayMap<String, Any?>?> = _unrecognizedOverrides
+
+    private fun setOverrideConfig(newOverrides: PersistableBundle?): Boolean {
+        carrierConfigManager.overrideConfig(subId.value, newOverrides, CarrierConfigManager.CONFIG_OVERRIDE_TYPE_GRAPHENEOS)
+        return true
+    }
+
+    private suspend fun reloadFromCarrierConfig() {
+        val activeOverrides = carrierConfigManager.getConfigOverrides(subId.value, false)
+        Log.d(TAG, "activeOverrides: $activeOverrides")
+        _isAnOverrideActive.update { !activeOverrides.isEmpty }
+
+        // Display any overrides from AOSP. We expect these to not be set, because
+        // CarrierConfigLoader's overrideConfig is normally just a test API.
+        val overridesFromAosp: PersistableBundle = carrierConfigManager.getConfigOverrides(subId.value, true)
+
+        if (overridesFromAosp.isEmpty) {
+            _unrecognizedOverrides.update { null }
+        } else {
+            // every override from AOSP is unrecognized
+            val newUnrecognizedOverrides = ArrayMap<String, Any?>()
+            overridesFromAosp.keySet().forEach { key ->
+                newUnrecognizedOverrides[key] = overridesFromAosp.get(key)
+            }
+            Log.d(TAG, "found newUnrecognizedOverrides: $newUnrecognizedOverrides")
+            _unrecognizedOverrides.update {
+                newUnrecognizedOverrides.ifEmpty { null }
+            }
+        }
+
+        // Construct states
+        val configList = allowedUserChangeableCarrierConfigOptions.map { flagKey ->
+            val state = CarrierConfigState.createState(
+                subId.value,
+                carrierConfigRepo,
+                flagKey,
+                activeOverrides ?: PersistableBundle()
+            )
+            if (state.isOverriddenBefore.value && !_isAnOverrideActive.value) {
+                _isAnOverrideActive.update { true }
+            }
+            state
+        }
+
+        Log.d(TAG, "new configList is $configList")
+        withContext(Dispatchers.Main) {
+            if (_overrideStates.isEmpty()) {
+                _overrideStates.addAll(configList)
+            } else {
+                // preserve the selections if just trying to reload with latest state
+                _overrideStates.indices.forEach { index ->
+                    val newState = configList[index]
+                    _overrideStates[index] = _overrideStates[index].copy(
+                        indexOfValueBefore = newState.indexOfValueBefore,
+                        isOverriddenBefore = newState.isOverriddenBefore
+                    )
+                }
+            }
+        }
+    }
+
+    private val _isOverriding = MutableStateFlow(false)
+    val isOverrideInProgress: StateFlow<Boolean> = _isOverriding
+
+    sealed class MessageType {
+        data class ErrorMessage(val msg: String, val title: String? = null) : MessageType()
+        data object TurnOffToEdit : MessageType()
+    }
+
+    private val _message = MutableStateFlow<MessageType?>(null)
+    val message: Flow<MessageType?> =
+        combine(_message, _isAnOverrideActive) { errorMsg, active ->
+            errorMsg
+                ?: if (active) {
+                    MessageType.TurnOffToEdit
+                } else {
+                    null
+                }
+        }.distinctUntilChanged()
+
+    private val gate = Mutex()
+    fun submitOverrides(clearOverrides: Boolean): Unit = viewModelScope.launch {
+        if (!isInitialized) return@launch
+        if (!gate.tryLock()) return@launch
+        _isOverriding.update { true }
+        try {
+            val overrides: PersistableBundle? = if (clearOverrides) {
+                null
+            } else {
+                val bundle = PersistableBundle()
+                for (state in _overrideStates) {
+                    // null index means disabled. But the disabled option at the end could be
+                    // selected as well resulting in non-null configState.
+                    val configState = state.getConfigStateFromIndex() ?: continue
+                    configState.insertIntoBundle(state.key.keys, bundle)
+                }
+
+                if (bundle.isEmpty) {
+                    Log.d(TAG, "attempting to submit no overrides but not disabling")
+                    _message.update {
+                        MessageType.ErrorMessage(
+                            application.getString(
+                                R.string.carrier_settings_override_no_override_selected_message
+                            ),
+                            title = application.getString(
+                                R.string.carrier_settings_override_no_override_selected_title
+                            ),
+                        )
+                    }
+                    return@launch
+                }
+
+                bundle
+            }
+            Log.d(TAG, "submitting overrides $overrides")
+
+
+            try {
+                runThenAwaitCarrierConfigUpdateIfTrue {
+                    if (setOverrideConfig(overrides)) {
+                        _message.update { null }
+                        true
+                    } else {
+                        _message.update {
+                            MessageType.ErrorMessage(
+                                application.getString(
+                                    R.string.carrier_settings_override_error_unable_to_connect_to_config__s,
+                                    "setExtOverrideConfigs false"
+                                )
+                            )
+                        }
+                        false
+                    }
+                }
+
+                if (clearOverrides && !_unrecognizedOverrides.value.isNullOrEmpty()) {
+                    Log.d(TAG, "clearing all AOSP overrides")
+                    runThenAwaitCarrierConfigUpdateIfTrue {
+                        carrierConfigManager.overrideConfig(subId.value, null, CarrierConfigManager.CONFIG_OVERRIDE_TYPE_AOSP_PERSISTENT)
+                        true
+                    }
+                }
+            } catch (e: RemoteException) {
+                Log.e(TAG, "error while overriding config", e)
+                _message.update { MessageType.ErrorMessage("RemoteException: ${e.message}") }
+            }
+            reloadFromCarrierConfig()
+            // delay so user can't spam quickly
+            delay(250L)
+        } finally {
+            gate.unlock()
+            _isOverriding.update { false }
+        }
+    }.let { }
+
+    private suspend inline fun runThenAwaitCarrierConfigUpdateIfTrue(
+        timeoutMillis: Long = 2000L,
+        crossinline block: suspend () -> Boolean
+    ) {
+        coroutineScope {
+            // setOverrideConfig, etc. do the updates asynchronously, so the config is not
+            // guaranteed to update immediately after RPC Binder calls. Wait until an update is
+            // broadcast after making the override call.
+            //
+            // Start waiting here to avoid missing very a fast update.
+            val waiter = async { carrierConfigUpdatePing.first() }
+            try {
+                if (block()) {
+                    withTimeoutOrNull(timeoutMillis) {
+                        waiter.await()
+                    }
+                }
+            } finally {
+                waiter.cancel()
+            }
+        }
+    }
+}
+
+private suspend fun <T> Flow<T>.firstWithTimeoutOrNull(timeMillis: Long = 1000): T? =
+    withTimeoutOrNull(timeMillis) {
+        filter { it != null }.first()
+    }
diff --git a/src/com/android/settings/password/BiometricSecondFactorSaveAndFinishWorker.java b/src/com/android/settings/password/BiometricSecondFactorSaveAndFinishWorker.java
new file mode 100644
index 00000000000..66b262ff480
--- /dev/null
+++ b/src/com/android/settings/password/BiometricSecondFactorSaveAndFinishWorker.java
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.password;
+
+import static com.android.internal.widget.LockDomain.Secondary;
+
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.R;
+
+/**
+ * An invisible retained worker fragment to track the AsyncWork that saves the chosen biometric
+ * second factor.
+ * Based on upstream's SaveAndFinishWorker.
+ */
+public class BiometricSecondFactorSaveAndFinishWorker extends Fragment {
+    private static final String TAG = "BiometricSecondFactorSaveAndFinishWorker";
+
+    private Listener mListener;
+    private boolean mFinished;
+
+    private LockPatternUtils mUtils;
+
+    private int mUserId;
+    private LockscreenCredential mChosenCredential;
+    private LockscreenCredential mPrimaryCredential;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    public BiometricSecondFactorSaveAndFinishWorker setListener(Listener listener) {
+        if (mListener == listener) {
+            return this;
+        }
+
+        mListener = listener;
+        if (mFinished && mListener != null) {
+            mListener.onChosenLockSaveFinished();
+        }
+        return this;
+    }
+
+    private void prepare(LockPatternUtils utils, LockscreenCredential chosenCredential,
+            LockscreenCredential primaryCredential, int userId) {
+        mUtils = utils;
+        mUserId = userId;
+        mFinished = false;
+
+        mChosenCredential = chosenCredential;
+        mPrimaryCredential = primaryCredential;
+    }
+
+    public void start(LockPatternUtils utils, LockscreenCredential chosenCredential,
+            LockscreenCredential primaryCredential, int userId) {
+        prepare(utils, chosenCredential, primaryCredential, userId);
+        new BiometricSecondFactorSaveAndFinishWorker.Task().execute();
+    }
+
+    private boolean saveAndVerifyInBackground() {
+        final int userId = mUserId;
+        try {
+            if (!mUtils.setLockCredential(mChosenCredential, mPrimaryCredential, Secondary,
+                    userId)) {
+                return false;
+            }
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to set credential", e);
+            return false;
+        }
+
+        return true;
+    }
+
+    private void finish() {
+        mFinished = true;
+        if (mListener != null) {
+            mListener.onChosenLockSaveFinished();
+        }
+    }
+
+    private class Task extends AsyncTask<Void, Void, Boolean> {
+
+        @Override
+        protected Boolean doInBackground(Void... params){
+            return saveAndVerifyInBackground();
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            if (!result) {
+                Toast.makeText(getContext(),
+                        R.string.biometric_second_factor_pin_change_failed, Toast.LENGTH_LONG)
+                        .show();
+            }
+            finish();
+        }
+    }
+
+    interface Listener {
+        void onChosenLockSaveFinished();
+    }
+}
diff --git a/src/com/android/settings/password/ChooseBiometricSecondFactorPin.java b/src/com/android/settings/password/ChooseBiometricSecondFactorPin.java
new file mode 100644
index 00000000000..b699a8b8bec
--- /dev/null
+++ b/src/com/android/settings/password/ChooseBiometricSecondFactorPin.java
@@ -0,0 +1,706 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.password;
+
+import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
+import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;
+import static com.android.internal.widget.LockDomain.Secondary;
+import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager.PasswordComplexity;
+import android.app.admin.PasswordMetrics;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Insets;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.widget.CheckBox;
+import android.widget.ImeAwareEditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.PasswordValidationError;
+import com.android.internal.widget.TextViewInputDisabler;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.util.ThemeHelper;
+
+import java.util.List;
+
+/**
+ * Activity that allows the user to set/choose their biometric second factor PIN.
+ * Based on upstream's ChooseLockPassword.
+ */
+public class ChooseBiometricSecondFactorPin extends SettingsActivity {
+    private static final String TAG = "ChooseLockPassword";
+
+    private static final String EXTRA_KEY_PRIMARY_CREDENTIAL = "primary_credential";
+    // Not using Intent.EXTRA_USER_ID as we want to make this private to force use of the
+    // IntentBuilder.
+    private static final String EXTRA_USER_ID = "user_id";
+
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getFragmentClass().getName());
+        return modIntent;
+    }
+
+    public static class IntentBuilder {
+
+        private final Intent mIntent;
+
+        public IntentBuilder(Context context) {
+            mIntent = new Intent(context, ChooseBiometricSecondFactorPin.class);
+        }
+
+        public IntentBuilder setUserId(int userId) {
+            mIntent.putExtra(EXTRA_USER_ID, userId);
+            return this;
+        }
+
+        public IntentBuilder setPrimaryCredential(LockscreenCredential primaryCredential) {
+            mIntent.putExtra(EXTRA_KEY_PRIMARY_CREDENTIAL, primaryCredential);
+            return this;
+        }
+
+        public Intent build() {
+            return mIntent;
+        }
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseBiometricSecondFactorPinFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
+    protected boolean isToolbarEnabled() {
+        return false;
+    }
+
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return ChooseBiometricSecondFactorPinFragment.class;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        ThemeHelper.trySetDynamicColor(this);
+        super.onCreate(savedInstanceState);
+        findViewById(R.id.content_parent).setFitsSystemWindows(false);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+
+    public static class ChooseBiometricSecondFactorPinFragment extends InstrumentedFragment
+            implements OnEditorActionListener, TextWatcher,
+            BiometricSecondFactorSaveAndFinishWorker.Listener {
+        private static final String KEY_FIRST_PASSWORD = "first_password";
+        private static final String KEY_UI_STAGE = "ui_stage";
+        private static final String KEY_PRIMARY_CREDENTIAL = "primary_credential";
+        private static final String FRAGMENT_BIOMETRIC_SECOND_FACTOR_TAG_SAVE_AND_FINISH =
+                "save_and_finish_worker";
+        private static final String KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED =
+                "auto_confirm_option_set_manually";
+
+        private static final int MIN_AUTO_PIN_REQUIREMENT_LENGTH = 6;
+
+        private LockscreenCredential mPrimaryCredential;
+        private LockscreenCredential mChosenPassword;
+        private ImeAwareEditText mPasswordEntry;
+        private TextViewInputDisabler mPasswordEntryInputDisabler;
+
+        private List<PasswordValidationError> mValidationErrors;
+
+        protected int mUserId;
+
+        private LockPatternUtils mLockPatternUtils;
+        private BiometricSecondFactorSaveAndFinishWorker mSaveAndFinishWorker;
+
+        protected Stage mUiStage = Stage.Introduction;
+        private PasswordRequirementAdapter mPasswordRequirementAdapter;
+        private GlifLayout mLayout;
+
+        private LockscreenCredential mFirstPassword;
+        private RecyclerView mPasswordRestrictionView;
+        protected FooterButton mSkipOrClearButton;
+        private FooterButton mNextButton;
+        private TextView mMessage;
+        protected CheckBox mAutoPinConfirmOption;
+        protected TextView mAutoConfirmSecurityMessage;
+        protected boolean mIsAutoPinConfirmOptionSetManually;
+
+        private TextChangedHandler mTextChangedHandler;
+
+        public static final int RESULT_FINISHED = RESULT_FIRST_USER;
+        public static final int RESULT_NOT_FOREGROUND = RESULT_FIRST_USER + 1;
+
+        private boolean mIsErrorTooShort = true;
+
+        /**
+         * Keep track internally of where the user is in choosing a pattern.
+         */
+        protected enum Stage {
+
+            Introduction(
+                    R.string.biometric_second_factor_pin_choose_header,
+                    R.string.next_label),
+
+            NeedToConfirm(
+                    R.string.biometric_second_factor_confirm_header,
+                    R.string.lockpassword_confirm_label),
+
+            ConfirmWrong(
+                    R.string.lockpassword_confirm_pins_dont_match,
+                    R.string.lockpassword_confirm_label);
+
+            Stage(int hintInNumeric, int nextButtonText) {
+                this.numericHint = hintInNumeric;
+                this.buttonText = nextButtonText;
+            }
+
+            public final int numericHint;
+            public final int buttonText;
+
+            public String getHint(Context context) {
+                return context.getString(numericHint);
+            }
+        }
+
+        // required constructor for fragments
+        public ChooseBiometricSecondFactorPinFragment() {
+
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            Intent intent = getActivity().getIntent();
+            if (!(getActivity() instanceof ChooseBiometricSecondFactorPin)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
+
+            Bundle extras = intent.getExtras();
+            extras.getInt(EXTRA_USER_ID, -1);
+
+            mLockPatternUtils = FeatureFactory.getFeatureFactory()
+                    .getSecurityFeatureProvider()
+                    .getLockPatternUtils(getContext());
+
+            mUserId = intent.getIntExtra(EXTRA_USER_ID, -1);
+
+            mTextChangedHandler = new TextChangedHandler();
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.choose_biometric_second_factor_pin, container, false);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+
+            mLayout = (GlifLayout) view;
+
+            // Make the password container consume the optical insets so the edit text is aligned
+            // with the sides of the parent visually.
+            ViewGroup container = view.findViewById(R.id.password_container);
+            container.setOpticalInsets(Insets.NONE);
+
+            final FooterBarMixin mixin = mLayout.getMixin(FooterBarMixin.class);
+            mixin.setSecondaryButton(
+                    new FooterButton.Builder(getActivity())
+                            .setText(R.string.lockpassword_clear_label)
+                            .setListener(this::onSkipOrClearButtonClick)
+                            .setButtonType(FooterButton.ButtonType.SKIP)
+                            .setTheme(
+                                    com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
+                            .build()
+            );
+            mixin.setPrimaryButton(
+                    new FooterButton.Builder(getActivity())
+                            .setText(R.string.next_label)
+                            .setListener(this::onNextButtonClick)
+                            .setButtonType(FooterButton.ButtonType.NEXT)
+                            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
+                            .build()
+            );
+            mSkipOrClearButton = mixin.getSecondaryButton();
+            mNextButton = mixin.getPrimaryButton();
+
+            mMessage = view.findViewById(R.id.sud_layout_description);
+            mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
+
+            final LinearLayout headerLayout = view.findViewById(
+                    com.google.android.setupdesign.R.id.sud_layout_header);
+            setupPasswordRequirementsView(headerLayout);
+
+            mPasswordRestrictionView.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mPasswordEntry = view.findViewById(R.id.password_entry);
+            mPasswordEntry.setOnEditorActionListener(this);
+            mPasswordEntry.addTextChangedListener(this);
+            mPasswordEntry.requestFocus();
+            mPasswordEntryInputDisabler = new TextViewInputDisabler(mPasswordEntry);
+
+            // Fetch the AutoPinConfirmOption
+            mAutoPinConfirmOption = view.findViewById(R.id.auto_pin_confirm_enabler);
+            mAutoConfirmSecurityMessage = view.findViewById(R.id.auto_pin_confirm_security_message);
+            mIsAutoPinConfirmOptionSetManually = false;
+            setOnAutoConfirmOptionClickListener();
+            if (mAutoPinConfirmOption != null) {
+                mAutoPinConfirmOption.setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE);
+                mAutoPinConfirmOption.setVisibility(View.GONE);
+                mAutoPinConfirmOption.setChecked(false);
+            }
+
+            final Activity activity = getActivity();
+
+            mPasswordEntry.setInputType(
+                    InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+
+            mPasswordEntry.setContentDescription(
+                    getString(R.string.unlock_set_unlock_pin_title));
+
+            // Can't set via XML since setInputType resets the fontFamily to null
+            mPasswordEntry.setTypeface(Typeface.create(
+                    getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                    Typeface.NORMAL));
+
+            Intent intent = getActivity().getIntent();
+            mPrimaryCredential = intent.getParcelableExtra(EXTRA_KEY_PRIMARY_CREDENTIAL);
+            if (savedInstanceState == null) {
+                updateStage(Stage.Introduction);
+            } else {
+                // restore from previous state
+                mFirstPassword = savedInstanceState.getParcelable(KEY_FIRST_PASSWORD);
+                final String state = savedInstanceState.getString(KEY_UI_STAGE);
+                if (state != null) {
+                    mUiStage = Stage.valueOf(state);
+                    updateStage(mUiStage);
+                }
+                mIsAutoPinConfirmOptionSetManually =
+                        savedInstanceState.getBoolean(KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED);
+
+                mPrimaryCredential = savedInstanceState.getParcelable(KEY_PRIMARY_CREDENTIAL);
+
+                // Re-attach to the exiting worker if there is one.
+                mSaveAndFinishWorker = (BiometricSecondFactorSaveAndFinishWorker)
+                        getFragmentManager().findFragmentByTag(
+                                FRAGMENT_BIOMETRIC_SECOND_FACTOR_TAG_SAVE_AND_FINISH);
+            }
+
+            if (activity instanceof SettingsActivity) {
+                final SettingsActivity sa = (SettingsActivity) activity;
+                String title = Stage.Introduction.getHint(getContext());
+                sa.setTitle(title);
+                mLayout.setHeaderText(title);
+            }
+        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+            if (mPrimaryCredential != null) {
+                mPrimaryCredential.zeroize();
+            }
+            // Force a garbage collection immediately to remove remnant of user password shards
+            // from memory.
+            System.gc();
+            System.runFinalization();
+            System.gc();
+        }
+
+        private void setupPasswordRequirementsView(@Nullable ViewGroup view) {
+            if (view == null) {
+                return;
+            }
+
+            createHintMessageView(view);
+            mPasswordRestrictionView.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mPasswordRequirementAdapter = new PasswordRequirementAdapter(getActivity());
+            mPasswordRestrictionView.setAdapter(mPasswordRequirementAdapter);
+            view.addView(mPasswordRestrictionView);
+        }
+
+        private void createHintMessageView(ViewGroup view) {
+            if (mPasswordRestrictionView != null) {
+                return;
+            }
+
+            final TextView sucTitleView = view.findViewById(
+                    com.google.android.setupdesign.R.id.suc_layout_title);
+            final ViewGroup.MarginLayoutParams titleLayoutParams =
+                    (ViewGroup.MarginLayoutParams) sucTitleView.getLayoutParams();
+            mPasswordRestrictionView = new RecyclerView(getActivity());
+            final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT);
+            lp.setMargins(titleLayoutParams.leftMargin, getResources().getDimensionPixelSize(
+                    R.dimen.biometric_second_factor_pin_requirement_view_margin_top),
+                    titleLayoutParams.leftMargin, 0);
+            mPasswordRestrictionView.setLayoutParams(lp);
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return SettingsEnums.PAGE_UNKNOWN;
+        }
+
+        @Override
+        public void onResume() {
+            super.onResume();
+            updateStage(mUiStage);
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(this);
+            } else {
+                mPasswordEntry.requestFocus();
+                mPasswordEntry.scheduleShowSoftInput();
+            }
+        }
+
+        @Override
+        public void onPause() {
+            if (mSaveAndFinishWorker != null) {
+                mSaveAndFinishWorker.setListener(null);
+            }
+            super.onPause();
+        }
+
+        @Override
+        public void onStop() {
+            super.onStop();
+            if (!getActivity().isChangingConfigurations()) {
+                getActivity().setResult(RESULT_NOT_FOREGROUND);
+                getActivity().finish();
+            }
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putString(KEY_UI_STAGE, mUiStage.name());
+            outState.putParcelable(KEY_FIRST_PASSWORD, mFirstPassword);
+            outState.putParcelable(KEY_PRIMARY_CREDENTIAL, mPrimaryCredential.duplicate());
+            outState.putBoolean(KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED,
+                    mIsAutoPinConfirmOptionSetManually);
+        }
+
+        protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
+            mUiStage = stage;
+            updateUi();
+
+            // If the stage changed, announce the header for accessibility. This
+            // is a no-op when accessibility is disabled.
+            if (previousStage != stage) {
+                mLayout.announceForAccessibility(mLayout.getHeaderText());
+            }
+        }
+
+        /**
+         * Validates PIN and returns the validation result and updates mValidationErrors
+         * to reflect validation results.
+         *
+         * @param credential credential the user typed in.
+         * @return whether password satisfies all the requirements.
+         */
+        @VisibleForTesting
+        boolean validatePassword(LockscreenCredential credential) {
+            PasswordMetrics minMetrics = new PasswordMetrics(CREDENTIAL_TYPE_NONE);
+            @PasswordComplexity int minComplexity = PASSWORD_COMPLEXITY_NONE;
+            mValidationErrors = PasswordMetrics.validateCredential(minMetrics, minComplexity,
+                    credential);
+            return mValidationErrors.isEmpty();
+        }
+
+        public void handleNext() {
+            if (mSaveAndFinishWorker != null) return;
+            // TODO(b/120484642): This is a point of entry for passwords from the UI
+            final Editable passwordText = mPasswordEntry.getText();
+            if (TextUtils.isEmpty(passwordText)) {
+                return;
+            }
+            mChosenPassword = LockscreenCredential.createPin(passwordText);
+            if (mUiStage == Stage.Introduction) {
+                if (validatePassword(mChosenPassword)) {
+                    mFirstPassword = mChosenPassword;
+                    mPasswordEntry.setText("");
+                    updateStage(Stage.NeedToConfirm);
+                } else {
+                    mChosenPassword.zeroize();
+                }
+            } else if (mUiStage == Stage.NeedToConfirm) {
+                if (mChosenPassword.equals(mFirstPassword)) {
+                    startSaveAndFinish();
+                } else {
+                    CharSequence tmp = mPasswordEntry.getText();
+                    if (tmp != null) {
+                        Selection.setSelection((Spannable) tmp, 0, tmp.length());
+                    }
+                    updateStage(Stage.ConfirmWrong);
+                    mChosenPassword.zeroize();
+                }
+            }
+        }
+
+        protected void setNextEnabled(boolean enabled) {
+            mNextButton.setEnabled(enabled);
+        }
+
+        protected void setNextText(int text) {
+            mNextButton.setText(getActivity(), text);
+        }
+
+        protected void onSkipOrClearButtonClick(View view) {
+            mPasswordEntry.setText("");
+        }
+
+        protected void onNextButtonClick(View view) {
+            handleNext();
+        }
+
+        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            // Check if this was the result of hitting the enter or "done" key
+            if (actionId == EditorInfo.IME_NULL
+                    || actionId == EditorInfo.IME_ACTION_DONE
+                    || actionId == EditorInfo.IME_ACTION_NEXT) {
+                handleNext();
+                return true;
+            }
+            return false;
+        }
+
+    String[] convertErrorCodeToMessages() {
+        var pvec =
+                new ChooseLockPassword.ChooseLockPasswordFragment.PasswordValidationErrorConverter(
+                        getContext(), false, ChooseLockPassword.ChooseLockPasswordFragment.ProfileType.None,
+                        mValidationErrors);
+        String[] res = pvec.convertErrorCodeToMessages();
+        mIsErrorTooShort = pvec.mIsErrorTooShort;
+        return res;
+    }
+
+        /**
+         * Update the hint based on current Stage and length of password entry
+         */
+        protected void updateUi() {
+            final boolean canInput = mSaveAndFinishWorker == null;
+
+            LockscreenCredential password = LockscreenCredential.createPin(mPasswordEntry.getText());
+            final int length = password.size();
+            if (mUiStage == Stage.Introduction) {
+                mLayout.setDescriptionText(R.string.biometric_second_factor_pin_description);
+                mPasswordRestrictionView.setVisibility(View.VISIBLE);
+                final boolean passwordCompliant = validatePassword(password);
+                String[] messages = convertErrorCodeToMessages();
+                // Update the fulfillment of requirements.
+                mPasswordRequirementAdapter.setRequirements(messages, mIsErrorTooShort);
+                // set the visibility of pin_auto_confirm option accordingly
+                setAutoPinConfirmOption(passwordCompliant, length);
+                // Enable/Disable the next button accordingly.
+                setNextEnabled(passwordCompliant);
+            } else {
+                mLayout.setDescriptionText(
+                        R.string.biometric_second_factor_pin_description_empty);
+                // Hide password requirement view when we are just asking user to confirm the pw.
+                mPasswordRestrictionView.setVisibility(View.GONE);
+                setHeaderText(mUiStage.getHint(getContext()));
+                setNextEnabled(canInput && length >= LockPatternUtils.MIN_LOCK_PASSWORD_SIZE);
+                mSkipOrClearButton.setVisibility(toVisibility(canInput && length > 0));
+
+                // Hide the pin_confirm option when we are just asking user to confirm the pwd.
+                mAutoPinConfirmOption.setVisibility(View.GONE);
+                mAutoConfirmSecurityMessage.setVisibility(View.GONE);
+            }
+            mMessage.setVisibility(View.GONE);
+
+            setNextText(mUiStage.buttonText);
+            mPasswordEntryInputDisabler.setInputEnabled(canInput);
+            password.zeroize();
+        }
+
+        protected int toVisibility(boolean visibleOrGone) {
+            return visibleOrGone ? View.VISIBLE : View.GONE;
+        }
+
+        private void setAutoPinConfirmOption(boolean enabled, int length) {
+            // This feature is enabled in the backend, but we don't allow the user to set it yet.
+            if (true || mAutoPinConfirmOption == null) {
+                return;
+            }
+            if (enabled && isAutoPinConfirmPossible(length)) {
+                mAutoPinConfirmOption.setVisibility(View.VISIBLE);
+                mAutoConfirmSecurityMessage.setVisibility(View.VISIBLE);
+            } else {
+                mAutoPinConfirmOption.setVisibility(View.GONE);
+                mAutoConfirmSecurityMessage.setVisibility(View.GONE);
+                mAutoPinConfirmOption.setChecked(false);
+            }
+        }
+
+        private boolean isAutoPinConfirmPossible(int currentPinLength) {
+            return currentPinLength >= MIN_AUTO_PIN_REQUIREMENT_LENGTH;
+        }
+
+        private void setOnAutoConfirmOptionClickListener() {
+            if (mAutoPinConfirmOption != null) {
+                mAutoPinConfirmOption.setOnClickListener((v) -> {
+                    mIsAutoPinConfirmOptionSetManually = true;
+                });
+            }
+        }
+
+        private void setHeaderText(String text) {
+            // Only set the text if it is different than the existing one to avoid announcing again.
+            if (!TextUtils.isEmpty(mLayout.getHeaderText())
+                    && mLayout.getHeaderText().toString().equals(text)) {
+                return;
+            }
+            mLayout.setHeaderText(text);
+        }
+
+        public void afterTextChanged(Editable s) {
+            // Changing the text while error displayed resets to NeedToConfirm state
+            if (mUiStage == Stage.ConfirmWrong) {
+                mUiStage = Stage.NeedToConfirm;
+            }
+            // Schedule the UI update.
+            mTextChangedHandler.notifyAfterTextChanged();
+        }
+
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+        }
+
+        private void startSaveAndFinish() {
+            if (mSaveAndFinishWorker != null) {
+                Log.w(TAG, "startSaveAndFinish with an existing " +
+                        "BiometricSecondFactorSaveAndFinishWorker.");
+                return;
+            }
+
+            ConfirmDeviceCredentialUtils.hideImeImmediately(
+                    getActivity().getWindow().getDecorView());
+
+            mPasswordEntryInputDisabler.setInputEnabled(false);
+            mSaveAndFinishWorker = new BiometricSecondFactorSaveAndFinishWorker();
+            mSaveAndFinishWorker
+                    .setListener(this);
+
+            getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
+                    FRAGMENT_BIOMETRIC_SECOND_FACTOR_TAG_SAVE_AND_FINISH).commit();
+            getFragmentManager().executePendingTransactions();
+
+            // update the setting before triggering the password save workflow,
+            // so that pinLength information is stored accordingly when setting is turned on.
+            mLockPatternUtils.setAutoPinConfirm(
+                    (mAutoPinConfirmOption != null && mAutoPinConfirmOption.isChecked()),
+                    mUserId, Secondary);
+
+            mSaveAndFinishWorker.start(mLockPatternUtils,
+                    mChosenPassword, mPrimaryCredential, mUserId);
+        }
+
+        @Override
+        public void onChosenLockSaveFinished() {
+            getActivity().setResult(RESULT_FINISHED);
+
+            if (mChosenPassword != null) {
+                mChosenPassword.zeroize();
+            }
+
+            if (mPrimaryCredential != null) {
+                mPrimaryCredential.zeroize();
+            }
+            if (mFirstPassword != null) {
+                mFirstPassword.zeroize();
+            }
+
+            mPasswordEntry.setText("");
+
+            if (mLayout != null) {
+                mLayout.announceForAccessibility(
+                        getString(R.string.accessibility_setup_password_complete));
+            }
+
+            getActivity().finish();
+        }
+
+        class TextChangedHandler extends Handler {
+            private static final int ON_TEXT_CHANGED = 1;
+            private static final int DELAY_IN_MILLISECOND = 100;
+
+            /**
+             * With the introduction of delay, we batch processing the text changed event to reduce
+             * unnecessary UI updates.
+             */
+            private void notifyAfterTextChanged() {
+                removeMessages(ON_TEXT_CHANGED);
+                sendEmptyMessageDelayed(ON_TEXT_CHANGED, DELAY_IN_MILLISECOND);
+            }
+
+            @Override
+            public void handleMessage(Message msg) {
+                if (getActivity() == null) {
+                    return;
+                }
+                if (msg.what == ON_TEXT_CHANGED) {
+                    updateUi();
+                }
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index f0225d81f7c..e117857743b 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -28,6 +28,7 @@
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK_ACTION;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE;
 
+import static com.android.internal.widget.LockDomain.Primary;
 import static com.android.settings.biometrics.BiometricEnrollBase.BIOMETRIC_AUTH_REQUEST;
 import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CALLER_APP_NAME;
@@ -46,6 +47,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.ext.settings.ExtSettings;
 import android.hardware.face.FaceManager;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
@@ -77,6 +79,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.WrappedLockPatternUtils;
 import com.android.settings.EventLogTags;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -89,6 +92,7 @@
 import com.android.settings.biometrics.IdentityCheckBiometricErrorDialog;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.ext.BoolSettingPrefController;
 import com.android.settings.flags.Flags;
 import com.android.settings.safetycenter.LockScreenSafetySource;
 import com.android.settings.search.SearchFeatureProvider;
@@ -96,6 +100,7 @@
 import com.android.settings.security.screenlock.LockAfterTimeoutPreferenceController;
 import com.android.settings.security.screenlock.PatternVisiblePreferenceController;
 import com.android.settings.security.screenlock.PinPrivacyPreferenceController;
+import com.android.settings.security.screenlock.PinScramblingPrefController;
 import com.android.settings.security.screenlock.PowerButtonInstantLockPreferenceController;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -181,6 +186,7 @@ public static class ChooseLockGenericFragment extends SettingsPreferenceFragment
         private LockPatternUtils mLockPatternUtils;
         private DevicePolicyManager mDpm;
         private boolean mRequestGatekeeperPasswordHandle = false;
+        private boolean mReturnCredentials = false;
         private boolean mPasswordConfirmed = false;
         private boolean mBiometricsAuthSuccessful = false;
         private boolean mWaitingForConfirmation = false;
@@ -276,6 +282,8 @@ public void onCreate(Bundle savedInstanceState) {
 
             mRequestGatekeeperPasswordHandle = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
+            mReturnCredentials = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             mForFace = intent.getBooleanExtra(
@@ -710,7 +718,7 @@ private void buildUnlockSettingsPreferenceControllers() {
             mUnlockSettingsControllers.add(new PatternVisiblePreferenceController(
                     getContext(), mUserId, mLockPatternUtils));
             mUnlockSettingsControllers.add(new PinPrivacyPreferenceController(
-                    getContext(), mUserId, mLockPatternUtils));
+                    getContext(), mUserId, new WrappedLockPatternUtils(mLockPatternUtils, Primary)));
             mUnlockSettingsControllers.add(new PowerButtonInstantLockPreferenceController(
                     getContext(), mUserId, mLockPatternUtils));
             mUnlockSettingsControllers.add(new LockAfterTimeoutPreferenceController(
@@ -718,6 +726,9 @@ private void buildUnlockSettingsPreferenceControllers() {
             mAutoPinConfirmPreferenceController = new AutoPinConfirmPreferenceController(
                     getContext(), mUserId, mLockPatternUtils, this);
             mUnlockSettingsControllers.add(mAutoPinConfirmPreferenceController);
+            mUnlockSettingsControllers.add(new PinScramblingPrefController(requireContext(), Primary));
+
+            mUnlockSettingsControllers.add(new BoolSettingPrefController(requireContext(), "allow_keyguard_camera", ExtSettings.ALLOW_KEYGUARD_CAMERA, UserHandle.of(mUserId)));
         }
 
         private void setUpUnlockSettingsPreference() {
@@ -893,7 +904,8 @@ protected Intent getLockPasswordIntent(int quality) {
                             .setForFace(mForFace)
                             .setForBiometrics(mForBiometrics)
                             .setUserId(mUserId)
-                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle);
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle)
+                            .setReturnCredentials(mReturnCredentials);
             if (mUserPassword != null) {
                 builder.setPassword(mUserPassword);
             }
diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java
index cd9eb2fd44d..48dc2094d50 100644
--- a/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -175,8 +175,9 @@ public boolean isScreenLockVisible(ScreenLockType type) {
                     && !managedProfile; // Swipe doesn't make sense for profiles.
             case MANAGED:
                 return mManagedPasswordProvider.isManagedPasswordChoosable();
-            case PIN:
             case PATTERN:
+                return false;
+            case PIN:
             case PASSWORD:
                 // Hide the secure lock screen options if the device doesn't support the secure lock
                 // screen feature.
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index b3d42275fae..e6339002c42 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -192,6 +192,12 @@ public IntentBuilder setPasswordRequirement(@PasswordComplexity int level,
             return this;
         }
 
+        public IntentBuilder setReturnCredentials(boolean returnCredentials) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS,
+                    returnCredentials);
+            return this;
+        }
+
         /**
          * Configures the launch such that at the end of the password enrollment, one of its
          * managed profile (specified by {@code profileId}) will have its lockscreen unified
@@ -251,7 +257,7 @@ public static class ChooseLockPasswordFragment extends InstrumentedFragment
         private LockscreenCredential mChosenPassword;
         private boolean mRequestGatekeeperPassword;
         private boolean mRequestWriteRepairModePassword;
-
+        private boolean mReturnCredentials;
         private EditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
 
@@ -292,7 +298,7 @@ public static class ChooseLockPasswordFragment extends InstrumentedFragment
         private boolean mIsExpressiveStyle = false;
 
         /** Used to store the profile type for which pin/password is being set */
-        protected enum ProfileType {
+        public enum ProfileType {
             None,
             Managed,
             Private,
@@ -656,6 +662,8 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
                     ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             mRequestWriteRepairModePassword = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW, false);
+            mReturnCredentials = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
             if (savedInstanceState == null) {
                 updateStage(Stage.Introduction);
                 if (confirmCredentials) {
@@ -931,11 +939,42 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
             return false;
         }
 
+    String[] convertErrorCodeToMessages() {
+        var pvec = new PasswordValidationErrorConverter(getContext(), mIsAlphaMode, mProfileType, mValidationErrors);
+        String[] res = pvec.convertErrorCodeToMessages();
+        mIsErrorTooShort = pvec.mIsErrorTooShort;
+        return res;
+    }
+
+    public static class PasswordValidationErrorConverter {
+        private final Context mContext;
+        private final boolean mIsAlphaMode;
+        private final ProfileType mProfileType;
+        private final List<PasswordValidationError> mValidationErrors;
+        public boolean mIsErrorTooShort = true;
+
+        public PasswordValidationErrorConverter(Context context, boolean isAlphaMode,
+                              ProfileType profileType,
+                              List<PasswordValidationError> validationErrors) {
+            mContext = context;
+            mIsAlphaMode = isAlphaMode;
+            mValidationErrors = validationErrors;
+            mProfileType = profileType;
+        }
+
+        private Context getContext() {
+            return mContext;
+        }
+
+        private String getString(int id) {
+            return mContext.getString(id);
+        }
+
         /**
          * @param errorCode error code returned from password validation.
          * @return an array of messages describing the error, important messages come first.
          */
-        String[] convertErrorCodeToMessages() {
+        public String[] convertErrorCodeToMessages() {
             List<String> messages = new ArrayList<>();
             mIsErrorTooShort = false;
             for (PasswordValidationError error : mValidationErrors) {
@@ -973,7 +1012,7 @@ String[] convertErrorCodeToMessages() {
                         break;
                     case TOO_SHORT:
                         mIsErrorTooShort = true;
-                        boolean isSupervisingProfile = isSupervisingProfile();
+                        boolean isSupervisingProfile = isSupervisingProfile(mProfileType);
                         String message = StringUtil.getIcuPluralsString(getContext(),
                                 error.requirement,
                                 mIsAlphaMode
@@ -1029,6 +1068,7 @@ String[] convertErrorCodeToMessages() {
 
             return messages.toArray(new String[0]);
         }
+    }
 
         /**
          * Update the hint based on current Stage and length of password entry
@@ -1096,9 +1136,6 @@ && isAutoPinConfirmPossible(length)
                     && !isSupervisingProfile()) {
                 mAutoPinConfirmOption.setVisibility(View.VISIBLE);
                 mAutoConfirmSecurityMessage.setVisibility(View.VISIBLE);
-                if (!mIsAutoPinConfirmOptionSetManually) {
-                    mAutoPinConfirmOption.setChecked(length == MIN_AUTO_PIN_REQUIREMENT_LENGTH);
-                }
             } else {
                 mAutoPinConfirmOption.setVisibility(View.GONE);
                 mAutoConfirmSecurityMessage.setVisibility(View.GONE);
@@ -1170,7 +1207,8 @@ private void startSaveAndFinish() {
             mSaveAndFinishWorker
                     .setListener(this)
                     .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)
-                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword);
+                    .setRequestWriteRepairModePassword(mRequestWriteRepairModePassword)
+                    .setReturnCredentials(mReturnCredentials);
 
             getFragmentManager().beginTransaction().add(mSaveAndFinishWorker,
                     FRAGMENT_TAG_SAVE_AND_FINISH).commit();
@@ -1274,8 +1312,12 @@ private ProfileType getProfileType() {
         }
 
         private boolean isSupervisingProfile() {
+            return isSupervisingProfile(mProfileType);
+        }
+
+        static boolean isSupervisingProfile(ProfileType profileType) {
             return android.multiuser.Flags.allowSupervisingProfile()
-                    && mProfileType.equals(ProfileType.Supervising);
+                    && profileType.equals(ProfileType.Supervising);
         }
     }
 }
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 0fc2c55f102..0812ad2aa9c 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -605,6 +605,9 @@ private void startVerifyPassword(LockscreenCredential credential, final Intent i
                                 ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
                                 response.getGatekeeperHAT());
                     }
+                    if (isInternalActivity()) {
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, credential);
+                    }
                 }
                 mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
                         localEffectiveUserId);
diff --git a/src/com/android/settings/password/SaveAndFinishWorker.java b/src/com/android/settings/password/SaveAndFinishWorker.java
index 2428d541a3c..12a0e69e539 100644
--- a/src/com/android/settings/password/SaveAndFinishWorker.java
+++ b/src/com/android/settings/password/SaveAndFinishWorker.java
@@ -48,6 +48,7 @@ public class SaveAndFinishWorker extends Fragment {
     private LockPatternUtils mUtils;
     private boolean mRequestGatekeeperPassword;
     private boolean mRequestWriteRepairModePassword;
+    private boolean mReturnCredentials;
     private boolean mWasSecureBefore;
     private int mUserId;
     private int mUnificationProfileId = UserHandle.USER_NULL;
@@ -129,11 +130,17 @@ Pair<Boolean, Intent> saveAndVerifyInBackground() {
         if (mRequestWriteRepairModePassword) {
             flags |= LockPatternUtils.VERIFY_FLAG_WRITE_REPAIR_MODE_PW;
         }
+        Intent result = new Intent();
+        if (mReturnCredentials) {
+            // Need to duplicate as the original gets zeroized. Leaving the duplicate in memory is
+            // unavoidable when it is being returned as result data.
+            result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+                    mChosenCredential.duplicate());
+        }
         if (flags == 0) {
-            return Pair.create(true, null);
+            return Pair.create(true, mReturnCredentials ? result : null);
         }
 
-        Intent result = new Intent();
         final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenCredential,
                 userId, flags);
         if (response.isMatched()) {
@@ -177,6 +184,11 @@ public SaveAndFinishWorker setRequestWriteRepairModePassword(boolean value) {
         return this;
     }
 
+    public SaveAndFinishWorker setReturnCredentials(boolean value) {
+        mReturnCredentials = value;
+        return this;
+    }
+
     public SaveAndFinishWorker setBlocking(boolean blocking) {
         mBlocking = blocking;
         return this;
diff --git a/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java b/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
index 25e089fc134..c90bc2b7a9e 100644
--- a/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
+++ b/src/com/android/settings/privacy/CameraExtensionsFallbackPreferenceController.java
@@ -48,6 +48,14 @@ public boolean setChecked(boolean isChecked) {
 
     @Override
     public int getAvailabilityStatus() {
+        if (!com.android.internal.camera.flags.Flags.concertMode()) {
+            // this toggle is a no-op when concert_mode flag is off
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        if (mContext.getString(com.android.internal.R.string.config_extensionFallbackPackageName).isEmpty()) {
+            // this toggle is a no-op when there's no fallback camera extension package
+            return CONDITIONALLY_UNAVAILABLE;
+        }
         return AVAILABLE;
     }
 
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceController.java b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
index e7161f03074..9b5ad2fe5b2 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceController.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceController.java
@@ -60,9 +60,6 @@ public boolean setChecked(boolean isChecked) {
         mPrivateSpaceMaintainer.setHidePrivateSpaceEntryPointSetting(
                 isChecked ? HIDE_PRIVATE_SPACE_ENTRY_POINT_ENABLED_VAL
                         : HIDE_PRIVATE_SPACE_ENTRY_POINT_DISABLED_VAL);
-        if (isChecked) {
-            showAlertDialog();
-        }
         return true;
     }
 
@@ -70,16 +67,4 @@ public boolean setChecked(boolean isChecked) {
     public int getSliceHighlightMenuRes() {
         return 0;
     }
-
-    private void showAlertDialog() {
-        new AlertDialog.Builder(mContext)
-                .setTitle(R.string.private_space_hide_dialog_title)
-                .setMessage(R.string.private_space_hide_dialog_message)
-                .setPositiveButton(
-                        R.string.private_space_hide_dialog_button,
-                        (DialogInterface dialog, int which) -> {
-                            dialog.dismiss();
-                        })
-                .show();
-    }
 }
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
index 06cb90c3678..feb7805f706 100644
--- a/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceSettings.java
@@ -35,8 +35,6 @@
 public class HidePrivateSpaceSettings extends DashboardFragment {
     private static final String TAG = "HidePrivateSpaceSettings";
     private static final int IMPORTANT_FOR_ACCESSIBILITY_ITEM_COUNT = 5;
-    private static final String PRIVATE_SPACE_HIDE_ILLUSTRATION_KEY =
-            "private_space_hide_illustration";
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -82,9 +80,6 @@ public void onStart() {
     @Override
     public void onResume() {
         super.onResume();
-        final IllustrationPreference illustrationPreference =
-                getPreferenceScreen().findPreference(PRIVATE_SPACE_HIDE_ILLUSTRATION_KEY);
-        illustrationPreference.applyDynamicColor();
     }
 
     @Override
diff --git a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
index d1f36c64833..4c1bd2c2828 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
@@ -19,6 +19,10 @@
 import static com.android.settings.privatespace.PrivateSpaceAuthenticationActivity.EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED;
 
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.Log;
@@ -31,6 +35,21 @@
 public class PrivateSpaceDashboardFragment extends DashboardFragment {
     private static final String TAG = "PSDashboardFragment";
 
+    private final BroadcastReceiver mBroadcastReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    if (intent == null) {
+                        return;
+                    }
+                    String action = intent.getAction();
+                    if (Intent.ACTION_PROFILE_INACCESSIBLE.equals(action)
+                            || Intent.ACTION_PROFILE_UNAVAILABLE.equals(action)) {
+                        finishAndRemoveTaskIfLocked();
+                    }
+                }
+            };
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -52,6 +71,25 @@ && getIntent().getBooleanExtra(EXTRA_SHOW_PRIVATE_SPACE_UNLOCKED, false)) {
     @Override
     public void onStart() {
         super.onStart();
+        finishAndRemoveTaskIfLocked();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mBroadcastReceiver);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        final IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_PROFILE_UNAVAILABLE);
+        intentFilter.addAction(Intent.ACTION_PROFILE_INACCESSIBLE);
+        getActivity().registerReceiver(mBroadcastReceiver, intentFilter);
+    }
+
+    private void finishAndRemoveTaskIfLocked() {
         if (PrivateSpaceMaintainer.getInstance(getContext()).isPrivateSpaceLocked()) {
             // To make sure the task is removed if it is the last activity in that stack.
             getActivity().finishAndRemoveTask();
diff --git a/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java b/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
index e57b065b384..18a9b1ed8a5 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceSafetySource.java
@@ -56,10 +56,12 @@ public static void setSafetySourceData(Context context,
             }
         }
 
-        // Check the profile type - we don't want to show this for anything other than primary
-        // user.
-        if (userManager != null && !userManager.isMainUser()) {
-            Log.i(TAG, "setSafetySourceData not main user");
+        // Check the profile type - we don't want to show this for anything other than
+        // primary user and other users that can have private profiles
+        if (userManager != null && !userManager.isMainUser()
+                && !userManager.canHaveProfileOfType(UserManager.USER_TYPE_PROFILE_PRIVATE)) {
+            Log.i(TAG, "setSafetySourceData not main user," +
+                    " or user that can have private profiles");
             return;
         }
 
diff --git a/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java b/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
index 0f72e560217..d5a613ec307 100644
--- a/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
+++ b/src/com/android/settings/privatespace/autolock/AutoLockPreferenceController.java
@@ -39,12 +39,22 @@ public AutoLockPreferenceController(@NonNull Context context, @NonNull String ke
 
     @Override
     public int getAvailabilityStatus() {
+        // TODO: Add proper support for auto locking for other eligible full users
+        //       that can have private profiles, such as full secondary users, by Android 16.
+        if (getImmutableValue() != null) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+
         return AVAILABLE;
     }
 
     @NonNull
     @Override
     public CharSequence getSummary() {
+        Integer immutableSettingValue = getImmutableValue();
+        if (immutableSettingValue != null) {
+            return mAutoLockRadioOptions[immutableSettingValue];
+        }
         try {
             return mAutoLockRadioOptions[mPrivateSpaceMaintainer.getPrivateSpaceAutoLockSetting()];
         } catch (ArrayIndexOutOfBoundsException exception) {
@@ -52,4 +62,14 @@ public CharSequence getSummary() {
         }
         return mAutoLockRadioOptions[PrivateSpaceMaintainer.PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL];
     }
+
+    @android.provider.Settings.Secure.PrivateSpaceAutoLockOption
+    public Integer getImmutableValue() {
+        // Only disable it being immutable to system user, which is also the main user.
+        if (mContext.getUser().isSystem()) {
+            return null;
+        }
+
+        return android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;
+    }
 }
diff --git a/src/com/android/settings/privatespace/users/PrivateSpaceAppCopyPrefController.java b/src/com/android/settings/privatespace/users/PrivateSpaceAppCopyPrefController.java
new file mode 100644
index 00000000000..9a369eab172
--- /dev/null
+++ b/src/com/android/settings/privatespace/users/PrivateSpaceAppCopyPrefController.java
@@ -0,0 +1,99 @@
+
+package com.android.settings.privatespace.users;
+
+import static com.android.settings.dashboard.DashboardFragment.CATEGORY;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+import com.android.settings.users.AppCopyFragmentHelperExt;
+import com.android.settings.users.UserRestrictions;
+
+public class PrivateSpaceAppCopyPrefController extends BasePreferenceController {
+
+    private static final String TAG = "PrivateSpaceAppCopyPrefCtrl";
+
+    private final PrivateSpaceMaintainer privateSpaceMaintainer;
+
+    public PrivateSpaceAppCopyPrefController(Context ctx, String key) {
+        super(ctx, key);
+        privateSpaceMaintainer = PrivateSpaceMaintainer.getInstance(ctx);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        UserHandle privateSpaceUserHandle = privateSpaceMaintainer.getPrivateProfileHandle();
+        if (privateSpaceUserHandle == null) {
+            Log.w(getLogTag(), "No private space user fetched, treating as unavailable");
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        return AVAILABLE;
+    }
+
+    private String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setVisible(isAvailable());
+        UserRestrictions userRestrictions = getUserRestrictions();
+        if (userRestrictions != null) {
+            preference.setEnabled(!userRestrictions.isSet(UserManager.DISALLOW_INSTALL_APPS));
+        }
+    }
+
+    private UserRestrictions getUserRestrictions() {
+        UserHandle privateSpaceUserHandle = privateSpaceMaintainer.getPrivateProfileHandle();
+        if (privateSpaceUserHandle == null) {
+            return null;
+        }
+
+        return UserRestrictions.createInstance(mContext, privateSpaceUserHandle.getIdentifier());
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        UserHandle privateSpaceUserHandle = privateSpaceMaintainer.getPrivateProfileHandle();
+        if (privateSpaceUserHandle == null) {
+            return false;
+        }
+
+        if (privateSpaceMaintainer.isPrivateSpaceLocked()) {
+            return false;
+        }
+
+        String destName = preference.getFragment();
+        if (destName == null || destName.isEmpty()) {
+            return false;
+        }
+
+        boolean forPrivateSpace = true;
+        boolean showUserAppsOnly = true;
+        final Bundle args = AppCopyFragmentHelperExt.appendArgs(preference.getExtras(),
+                privateSpaceUserHandle.getIdentifier(), forPrivateSpace, showUserAppsOnly);
+
+        new SubSettingLauncher(preference.getContext())
+                .setDestination(destName)
+                .setSourceMetricsCategory(args.getInt(CATEGORY, SettingsEnums.PAGE_UNKNOWN))
+                .setArguments(args)
+                .launch();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/privatespace/users/PsCrossProfileClipboardAccessPrefCtrl.java b/src/com/android/settings/privatespace/users/PsCrossProfileClipboardAccessPrefCtrl.java
new file mode 100644
index 00000000000..666cecf4558
--- /dev/null
+++ b/src/com/android/settings/privatespace/users/PsCrossProfileClipboardAccessPrefCtrl.java
@@ -0,0 +1,55 @@
+package com.android.settings.privatespace.users;
+
+import android.content.Context;
+import android.ext.settings.IntSetting;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+import static android.ext.settings.CrossProfileClipboardAccessSettings.*;
+
+public class PsCrossProfileClipboardAccessPrefCtrl extends IntSettingPrefController {
+
+
+    public PsCrossProfileClipboardAccessPrefCtrl(Context ctx, String key) {
+        super(ctx, key, CROSS_PROFILE_CLIPBOARD_ACCESS_SETTINGS,
+                PrivateSpaceMaintainer.getInstance(ctx).getPrivateProfileHandle());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        int r = super.getAvailabilityStatus();
+        if (r == AVAILABLE) {
+            boolean hasPrivateProfile =
+                    PrivateSpaceMaintainer.getInstance(mContext).getPrivateProfileHandle() != null;
+            return hasPrivateProfile ? AVAILABLE : DISABLED_FOR_USER;
+        }
+
+        return r;
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.cross_profile_clipboard_access_allow_defaults_title,
+                R.string.cross_profile_clipboard_access_allow_defaults_summary,
+                FOLLOW_DEFAULT);
+        entries.add(R.string.cross_profile_clipboard_access_allow_import_defaults_title,
+                R.string.cross_profile_clipboard_access_allow_import_defaults_summary,
+                ALLOW_IMPORT_DEFAULTS_ONLY);
+        entries.add(R.string.cross_profile_clipboard_access_allow_export_defaults_title,
+                R.string.cross_profile_clipboard_access_allow_export_defaults_summary,
+                ALLOW_EXPORT_DEFAULTS_ONLY);
+        entries.add(R.string.cross_profile_clipboard_access_disallow_title,
+                R.string.cross_profile_clipboard_access_disallow_summary,
+                BLOCK);
+    }
+
+    @Override
+    public void addPrefsBeforeList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.cross_profile_clipboard_access_footer);
+    }
+}
diff --git a/src/com/android/settings/privatespace/users/PsDisallowDelayedLockingPrefController.java b/src/com/android/settings/privatespace/users/PsDisallowDelayedLockingPrefController.java
new file mode 100644
index 00000000000..3276fd3d3dc
--- /dev/null
+++ b/src/com/android/settings/privatespace/users/PsDisallowDelayedLockingPrefController.java
@@ -0,0 +1,34 @@
+package com.android.settings.privatespace.users;
+
+import android.content.Context;
+import android.ext.settings.BoolSetting;
+import android.ext.settings.ExtSettings;
+import android.os.UserHandle;
+import android.util.Log;
+
+import androidx.lifecycle.LifecycleOwner;
+
+import com.android.settings.ext.BoolSettingPrefController;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
+
+public class PsDisallowDelayedLockingPrefController extends BoolSettingPrefController {
+
+    private static final String TAG = "PsDisallowDelayedLockingPrefCtrl";
+
+    public PsDisallowDelayedLockingPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.DISALLOW_DELAYED_LOCKING_ON_USER_STOP,
+                PrivateSpaceMaintainer.getInstance(ctx).getPrivateProfileHandle());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        PrivateSpaceMaintainer privateSpaceMaintainer = PrivateSpaceMaintainer.getInstance(mContext);
+        UserHandle privateSpaceUserHandle = privateSpaceMaintainer.getPrivateProfileHandle();
+        if (privateSpaceUserHandle == null) {
+            Log.w(TAG, "No private space user fetched, treating as unavailable");
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/safetycenter/ExploitProtectionFragment.java b/src/com/android/settings/safetycenter/ExploitProtectionFragment.java
new file mode 100644
index 00000000000..2542012590b
--- /dev/null
+++ b/src/com/android/settings/safetycenter/ExploitProtectionFragment.java
@@ -0,0 +1,29 @@
+package com.android.settings.safetycenter;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class ExploitProtectionFragment extends DashboardFragment {
+    private static final String TAG = "ExploitProtFragment";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.exploit_protection_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return METRICS_CATEGORY_UNKNOWN;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.exploit_protection_settings);
+}
diff --git a/src/com/android/settings/safetycenter/IdentityCheckSafetySource.kt b/src/com/android/settings/safetycenter/IdentityCheckSafetySource.kt
index 735042afd85..fde3ea00b7f 100644
--- a/src/com/android/settings/safetycenter/IdentityCheckSafetySource.kt
+++ b/src/com/android/settings/safetycenter/IdentityCheckSafetySource.kt
@@ -159,7 +159,7 @@ class IdentityCheckSafetySource : BroadcastReceiver() {
             Settings.Secure.getInt(
                 context.contentResolver,
                 Settings.Secure.IDENTITY_CHECK_PROMO_CARD_SHOWN,
-                0, /* def */
+                1, /* def */
             ) == 1
 
         private fun getIssue(context: Context): SafetySourceIssue {
diff --git a/src/com/android/settings/security/AutoRebootPrefController.java b/src/com/android/settings/security/AutoRebootPrefController.java
new file mode 100644
index 00000000000..9c00e954e96
--- /dev/null
+++ b/src/com/android/settings/security/AutoRebootPrefController.java
@@ -0,0 +1,49 @@
+package com.android.settings.security;
+
+import android.content.Context;
+import android.ext.settings.ExtSettings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.HOURS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+public class AutoRebootPrefController extends IntSettingPrefController {
+
+    public AutoRebootPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.AUTO_REBOOT_TIMEOUT);
+    }
+
+    @Override
+    public void addPrefsBeforeList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.auto_reboot_footer,
+                "https://grapheneos.org/features#auto-reboot");
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.switch_off_text, 0);
+        entries.add(3, DAYS);
+        entries.add(2, DAYS);
+        entries.add(36, HOURS);
+        entries.add(1, DAYS);
+        entries.add(18, HOURS);
+        entries.add(12, HOURS);
+        entries.add(8, HOURS);
+        entries.add(4, HOURS);
+        entries.add(2, HOURS);
+        entries.add(1, HOURS);
+        entries.add(30, MINUTES);
+        entries.add(10, MINUTES);
+    }
+
+    @Override
+    protected boolean isCredentialConfirmationRequired() {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/security/DuressPasswordActivity.java b/src/com/android/settings/security/DuressPasswordActivity.java
new file mode 100644
index 00000000000..54a6cb89feb
--- /dev/null
+++ b/src/com/android/settings/security/DuressPasswordActivity.java
@@ -0,0 +1,71 @@
+package com.android.settings.security;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.overlay.FeatureFactory;
+import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.template.DescriptionMixin;
+import com.google.android.setupdesign.util.ThemeHelper;
+
+public class DuressPasswordActivity extends Activity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+
+        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        ThemeHelper.trySetDynamicColor(this);
+
+        setResult(RESULT_OK);
+    }
+
+    protected boolean allowNextOnStop;
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (!isChangingConfigurations() && hasUserCredential()) {
+            if (allowNextOnStop) {
+                allowNextOnStop = false;
+            } else {
+                // require user credential to be re-entered after activity is backgrounded
+                setResult(RESULT_CANCELED);
+                finish();
+            }
+        }
+    }
+
+    protected boolean hasUserCredential() {
+        return true;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (!isChangingConfigurations()) {
+            /** @see com.android.settings.password.ConfirmDeviceCredentialBaseActivity#onDestroy */
+            getMainThreadHandler().postDelayed(() -> {
+                System.gc();
+                System.runFinalization();
+                System.gc();
+            }, 5000);
+        }
+    }
+
+    static void adjustDescriptionStyle(GlifLayout l) {
+        l.getMixin(DescriptionMixin.class).getTextView().setTextSize(16f);
+    }
+
+    LockPatternUtils getLockPatternUtils() {
+        return FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(this);
+    }
+}
diff --git a/src/com/android/settings/security/DuressPasswordMainActivity.java b/src/com/android/settings/security/DuressPasswordMainActivity.java
new file mode 100644
index 00000000000..e99f38e43a7
--- /dev/null
+++ b/src/com/android/settings/security/DuressPasswordMainActivity.java
@@ -0,0 +1,182 @@
+package com.android.settings.security;
+
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.R;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.google.android.setupdesign.GlifRecyclerLayout;
+import com.google.android.setupdesign.items.IItem;
+import com.google.android.setupdesign.items.Item;
+import com.google.android.setupdesign.items.ItemGroup;
+import com.google.android.setupdesign.items.RecyclerItemAdapter;
+
+import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
+
+public class DuressPasswordMainActivity extends DuressPasswordActivity implements RecyclerItemAdapter.OnItemSelectedListener {
+    private static final String TAG = DuressPasswordMainActivity.class.getSimpleName();
+    private static final String KEY_USER_CREDENTIAL = "user_credential";
+    private static final String KEY_HAS_ASKED_FOR_USER_CREDENTIALS = "asked_for_user_credentials";
+
+    private GlifRecyclerLayout layout;
+    private LockscreenCredential userCredential;
+    private boolean askedForUserCredentials;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        var layout = new GlifRecyclerLayout(this);
+        this.layout = layout;
+        layout.setIcon(getDrawable(R.drawable.ic_lock));
+        layout.setHeaderText(R.string.duress_pwd_pref_title);
+        adjustDescriptionStyle(layout);
+        layout.setDescriptionText(R.string.duress_pwd_description);
+
+        setContentView(layout);
+
+        if (savedInstanceState != null) {
+            userCredential = savedInstanceState.getParcelable(KEY_USER_CREDENTIAL, LockscreenCredential.class);
+            askedForUserCredentials = requireNonNull(savedInstanceState.getBoolean2(KEY_HAS_ASKED_FOR_USER_CREDENTIALS));
+        }
+    }
+
+    @Override
+    protected boolean hasUserCredential() {
+        return userCredential != null && !userCredential.isNone();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(KEY_USER_CREDENTIAL, userCredential);
+        outState.putBoolean(KEY_HAS_ASKED_FOR_USER_CREDENTIALS, askedForUserCredentials);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (userCredential == null) {
+            if (!getLockPatternUtils().isSecure(getUserId())) {
+                userCredential = LockscreenCredential.createNone();
+            } else if (!askedForUserCredentials) {
+                var b = new ChooseLockSettingsHelper.Builder(this);
+                b.setRequestCode(REQ_CODE_OBTAIN_USER_CREDENTIALS);
+                b.setReturnCredentials(true);
+                b.setForegroundOnly(true);
+                b.show();
+                askedForUserCredentials = true;
+            }
+        }
+
+        updateActionList();
+    }
+
+    private void updateActionList() {
+        if (userCredential == null) {
+            Log.d(TAG, "no userCredential, skipping updateActionList");
+            return;
+        }
+
+        var g = new ItemGroup();
+
+        if (getLockPatternUtils().hasDuressCredentials(userCredential)) {
+            g.addChild(createItem(R.string.duress_pwd_action_update, R.drawable.ic_edit));
+            g.addChild(createItem(R.string.duress_pwd_action_delete, R.drawable.ic_delete));
+        } else {
+            g.addChild(createItem(R.string.duress_pwd_action_add, R.drawable.ic_add_24dp));
+        }
+
+        var adapter = new RecyclerItemAdapter(g);
+        adapter.setOnItemSelectedListener(this);
+        layout.setAdapter(adapter);
+    }
+
+    private Item createItem(@StringRes int title, @DrawableRes int icon) {
+        var i = new Item();
+        i.setId(title);
+        i.setTitle(getText(title));
+        i.setIcon(getDrawable(icon));
+        return i;
+    }
+
+    // RecyclerItemAdapter.OnItemSelectedListener
+    @Override
+    public void onItemSelected(IItem iitem) {
+        Item item = (Item) iitem;
+        int id = item.getId();
+
+        if (id == R.string.duress_pwd_action_add || id == R.string.duress_pwd_action_update) {
+            var i = new Intent(this, DuressPasswordSetupActivity.class);
+            i.putExtra(DuressPasswordSetupActivity.EXTRA_TITLE_TEXT, id);
+            i.putExtra(DuressPasswordSetupActivity.EXTRA_USER_CREDENTIAL, userCredential);
+            allowNextOnStop = true;
+            startActivityForResult(i, REQ_CODE_SETUP);
+        } else if (id == R.string.duress_pwd_action_delete) {
+            var b = new AlertDialog.Builder(this);
+            b.setMessage(R.string.duress_pwd_action_delete_confirmation);
+            b.setPositiveButton(R.string.duress_pwd_delete_button, (dialog, which) -> {
+                LockPatternUtils lpu = getLockPatternUtils();
+                try {
+                    lpu.deleteDuressCredentials(userCredential);
+                } catch (Exception e) {
+                    Log.e(TAG, "deleteDuressCredentials failed", e);
+
+                    var d = new AlertDialog.Builder(this);
+                    d.setMessage(getString(R.string.duress_pwd_delete_error, e.toString()));
+                    d.setNeutralButton(R.string.duress_pwd_error_dialog_dismiss, null);
+                    d.show();
+                    return;
+                }
+                updateActionList();
+            });
+            b.setNegativeButton(R.string.duress_pwd_cancel_button, null);
+            b.show();
+        }
+    }
+
+    static final int REQ_CODE_OBTAIN_USER_CREDENTIALS = 1;
+    static final int REQ_CODE_SETUP = 2;
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQ_CODE_SETUP) {
+            if (resultCode == RESULT_CANCELED) {
+                finish();
+            }
+            return;
+        }
+
+        if (requestCode != REQ_CODE_OBTAIN_USER_CREDENTIALS) {
+            throw new IllegalStateException(Integer.toString(resultCode));
+        }
+
+        Log.d(TAG, "onActivityResult, requestCode: " + requestCode + ", resultCode: " + resultCode);
+
+        if (resultCode != RESULT_OK) {
+            finish();
+            return;
+        }
+
+        if (data == null) {
+            throw new IllegalStateException("data == null");
+        }
+
+        var credential = data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, LockscreenCredential.class);
+        if (credential == null) {
+            throw new IllegalStateException("no returned credential");
+        }
+        userCredential = credential;
+    }
+}
diff --git a/src/com/android/settings/security/DuressPasswordSetupActivity.java b/src/com/android/settings/security/DuressPasswordSetupActivity.java
new file mode 100644
index 00000000000..bbdfe05e000
--- /dev/null
+++ b/src/com/android/settings/security/DuressPasswordSetupActivity.java
@@ -0,0 +1,197 @@
+package com.android.settings.security;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.PasswordValidationError;
+import com.android.settings.R;
+import com.android.settings.password.ChooseLockPassword;
+import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.PasswordValidationErrorConverter;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupdesign.GlifLayout;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+
+public class DuressPasswordSetupActivity extends DuressPasswordActivity
+        implements TextView.OnEditorActionListener {
+    static final String TAG = DuressPasswordSetupActivity.class.getSimpleName();
+    static final String EXTRA_USER_CREDENTIAL = "user_credential";
+    static final String EXTRA_TITLE_TEXT = "title";
+    private boolean isUpdate;
+
+    enum DuressCredentialType {
+        PIN(LockscreenCredential::createPin,
+                R.id.pin_input, R.id.pin_input_confirmation,
+                R.string.lockpassword_confirm_pins_dont_match),
+        PASSWORD(LockscreenCredential::createPassword,
+                R.id.password_input, R.id.password_input_confirmation,
+                R.string.lockpassword_confirm_passwords_dont_match),
+        ;
+
+        final Function<String, LockscreenCredential> credenialCreator;
+        final @IdRes int mainInputId;
+        final @IdRes int confirmationInputId;
+        final @StringRes int confirmationMismatchText;
+
+        DuressCredentialType(Function<String, LockscreenCredential> credenialCreator,
+                             int mainInputId, int confirmationInputId,
+                             int confirmationMismatchText) {
+            this.credenialCreator = credenialCreator;
+            this.mainInputId = mainInputId;
+            this.confirmationInputId = confirmationInputId;
+            this.confirmationMismatchText = confirmationMismatchText;
+        }
+
+        LockscreenCredential createCredential(DuressPasswordSetupActivity activity) {
+            EditText ed = activity.requireViewById(mainInputId);
+            return credenialCreator.apply(ed.getText().toString());
+        }
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.duress_password_setup);
+
+        GlifLayout layout = requireViewById(R.id.glif_layout);
+        int headerText = getIntent().getExtras().getNumber(EXTRA_TITLE_TEXT);
+        isUpdate = headerText == R.string.duress_pwd_action_update;
+        layout.setHeaderText(headerText);
+        adjustDescriptionStyle(layout);
+
+        FooterBarMixin footerBar = layout.getMixin(FooterBarMixin.class);
+        {
+            var b = new FooterButton.Builder(this);
+            b.setText(isUpdate ? R.string.duress_pwd_update_button : R.string.duress_pwd_add_button);
+            b.setButtonType(FooterButton.ButtonType.DONE);
+            b.setListener(v -> save());
+            b.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary);
+            footerBar.setPrimaryButton(b.build());
+        }
+        {
+            var b = new FooterButton.Builder(this);
+            b.setText(R.string.duress_pwd_cancel_button);
+            b.setButtonType(FooterButton.ButtonType.CANCEL);
+            b.setListener(v -> finish());
+            b.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary);
+            footerBar.setSecondaryButton(b.build());
+        }
+        for (var ct : DuressCredentialType.values()) {
+            for (int id : new int[] { ct.mainInputId, ct.confirmationInputId }) {
+                EditText ed = requireViewById(id);
+                ed.setTag(ct);
+                ed.setOnEditorActionListener(this);
+            }
+        }
+    }
+
+    // TextView.OnEditorActionListener
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if ((actionId != EditorInfo.IME_ACTION_NEXT && actionId != EditorInfo.IME_ACTION_DONE)) {
+            return false;
+        }
+
+        EditText ed = (EditText) v;
+        DuressCredentialType ct = (DuressCredentialType) ed.getTag();
+        int id = v.getId();
+
+        if (id == ct.mainInputId) {
+            return !checkCredentialInputErrors(ct);
+        }
+        if (id == ct.confirmationInputId) {
+            return !checkCredentialConfirmationError(ct);
+        }
+        return false;
+    }
+
+    private void save() {
+        boolean credentialCheckRes = true;
+        for (DuressCredentialType ct : DuressCredentialType.values()) {
+            credentialCheckRes &= checkCredentialInputErrors(ct);
+            credentialCheckRes &= checkCredentialConfirmationError(ct);
+        }
+        if (!credentialCheckRes) {
+            return;
+        }
+
+        var userCredential = getIntent().getParcelableExtra(EXTRA_USER_CREDENTIAL, LockscreenCredential.class);
+        Objects.requireNonNull(userCredential, EXTRA_USER_CREDENTIAL);
+        LockscreenCredential pin = DuressCredentialType.PIN.createCredential(this);
+        LockscreenCredential password = DuressCredentialType.PASSWORD.createCredential(this);
+        LockPatternUtils lockPatternUtils = getLockPatternUtils();
+
+        Runnable save = () -> {
+            try {
+                lockPatternUtils.setDuressCredentials(userCredential, pin, password);
+            } catch (Exception e) {
+                Log.e(TAG, "setDuressCredentials failed", e);
+
+                var d = new AlertDialog.Builder(this);
+                d.setMessage(getString(R.string.duress_pwd_save_error, e.toString()));
+                d.setNeutralButton(R.string.duress_pwd_error_dialog_dismiss, null);
+                d.show();
+                return;
+            }
+            Toast.makeText(this,
+                    isUpdate ? R.string.duress_pwd_toast_updated : R.string.duress_pwd_toast_added,
+                    Toast.LENGTH_LONG).show();
+            finish();
+        };
+
+        if (isUpdate) {
+            save.run();
+        } else {
+            var warning = new AlertDialog.Builder(this);
+            warning.setTitle(R.string.duress_pwd_save_warning_title);
+            warning.setMessage(R.string.duress_pwd_save_warning_text);
+            warning.setNegativeButton(R.string.duress_pwd_cancel_button, null);
+            warning.setPositiveButton(R.string.duress_pwd_proceed_button, (d, w) -> {
+                save.run();
+            });
+            warning.show();
+        }
+    }
+
+    private boolean checkCredentialInputErrors(DuressCredentialType ct) {
+        EditText ed = requireViewById(ct.mainInputId);
+        String text = ed.getText().toString();
+        LockscreenCredential c = ct.credenialCreator.apply(text);
+
+        List<PasswordValidationError> errors = LockPatternUtils.validateDuressCredential(c);
+        String error = null;
+        boolean res = true;
+        if (!errors.isEmpty()) {
+            res = false;
+            var pvec = new PasswordValidationErrorConverter(this, c.isPassword(), ChooseLockPassword.ChooseLockPasswordFragment.ProfileType.None, errors);
+            error = String.join("\n", pvec.convertErrorCodeToMessages());
+        }
+        ed.setError(error);
+        return res;
+    }
+
+    private boolean checkCredentialConfirmationError(DuressCredentialType ct) {
+        EditText main = requireViewById(ct.mainInputId);
+        EditText confirmation = requireViewById(ct.confirmationInputId);
+
+        boolean res = main.getText().toString().equals(confirmation.getText().toString());
+        confirmation.setError(res ? null : getText(ct.confirmationMismatchText));
+        return res;
+    }
+}
diff --git a/src/com/android/settings/security/ExecSpawningFragment.java b/src/com/android/settings/security/ExecSpawningFragment.java
new file mode 100644
index 00000000000..5567b75bcf1
--- /dev/null
+++ b/src/com/android/settings/security/ExecSpawningFragment.java
@@ -0,0 +1,55 @@
+package com.android.settings.security;
+
+import android.content.Context;
+import android.ext.settings.BoolSetting;
+import android.ext.settings.ExtSettings;
+import android.net.Uri;
+import android.os.PowerManager;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.ext.BoolSettingFragment;
+import com.android.settingslib.widget.FooterPreference;
+
+import static java.util.Objects.requireNonNull;
+
+public class ExecSpawningFragment extends BoolSettingFragment {
+
+    @Override
+    protected BoolSetting getSetting() {
+        return ExtSettings.EXEC_SPAWNING;
+    }
+
+    @Override
+    protected CharSequence getTitle() {
+        return getText(R.string.exec_spawning_title);
+    }
+
+    @Override
+    protected CharSequence getMainSwitchTitle() {
+        return getText(R.string.exec_spawning_title_inner);
+    }
+
+    @Override
+    protected boolean interceptMainSwitchChange(boolean newValue) {
+        Context ctx = requireContext();
+        var b = new AlertDialog.Builder(ctx);
+        b.setMessage(R.string.exec_spawning_reboot_dialog);
+        b.setPositiveButton(R.string.exec_spawning_reboot_dialog_btn_restart, (dialog, which) -> {
+            var powerManager = requireNonNull(ctx.getSystemService(PowerManager.class));
+            if (ExtSettings.EXEC_SPAWNING.put(newValue)) {
+                powerManager.reboot(null);
+            }
+        });
+        b.show();
+        return true;
+    }
+
+    @Override
+    protected FooterPreference makeFooterPref(FooterPreference.Builder builder) {
+        FooterPreference p = builder.setTitle(R.string.exec_spawning_footer).build();
+        setFooterPrefLearnMoreUri(p, Uri.parse("https://grapheneos.org/usage#exec-spawning"));
+        return p;
+    }
+}
diff --git a/src/com/android/settings/security/ExecSpawningPrefController.java b/src/com/android/settings/security/ExecSpawningPrefController.java
new file mode 100644
index 00000000000..cd2be5cfc71
--- /dev/null
+++ b/src/com/android/settings/security/ExecSpawningPrefController.java
@@ -0,0 +1,13 @@
+package com.android.settings.security;
+
+import android.content.Context;
+import android.ext.settings.ExtSettings;
+
+import com.android.settings.ext.BoolSettingFragmentPrefController;
+
+public class ExecSpawningPrefController extends BoolSettingFragmentPrefController {
+
+    public ExecSpawningPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.EXEC_SPAWNING);
+    }
+}
diff --git a/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java b/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
index e74db34dee0..b1685685bb4 100644
--- a/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
+++ b/src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
@@ -178,9 +178,7 @@ private Integer getSummaryResId(int userId) {
         if (!mLockPatternUtils.isSecure(userId)) {
             if (userId == mProfileChallengeUserId
                     || mLockPatternUtils.isLockScreenDisabled(userId)) {
-                return com.android.settings.flags.Flags.biometricsOnboardingEducation()
-                        ? R.string.unlock_set_unlock_mode_off_new
-                        : R.string.unlock_set_unlock_mode_off;
+                return R.string.unlock_set_unlock_mode_off;
             } else {
                 return R.string.unlock_set_unlock_mode_none;
             }
diff --git a/src/com/android/settings/security/UsbPortSecurityPrefController.java b/src/com/android/settings/security/UsbPortSecurityPrefController.java
new file mode 100644
index 00000000000..557f73cc838
--- /dev/null
+++ b/src/com/android/settings/security/UsbPortSecurityPrefController.java
@@ -0,0 +1,85 @@
+package com.android.settings.security;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.ext.settings.UsbPortSecurity;
+import android.hardware.usb.UsbManager;
+
+import com.android.settings.R;
+import com.android.settings.ext.IntSettingPrefController;
+
+import static java.util.Objects.requireNonNull;
+
+public class UsbPortSecurityPrefController extends IntSettingPrefController {
+    private final boolean appliesToPogoPins;
+
+    public UsbPortSecurityPrefController(Context ctx, String key) {
+        super(ctx, key, UsbPortSecurity.MODE_SETTING);
+
+        appliesToPogoPins = ctx.getResources().getBoolean(
+                com.android.internal.R.bool.config_usb_port_security_applies_to_pogo_pins);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        String prefKey = getPreferenceKey();
+        if (appliesToPogoPins) {
+            if ("usbc_port".equals(prefKey)) {
+                return UNSUPPORTED_ON_DEVICE;
+            }
+        } else {
+            if ("usbc_port_and_pogo_pins".equals(prefKey)) {
+                return UNSUPPORTED_ON_DEVICE;
+            }
+        }
+
+        int res = super.getAvailabilityStatus();
+        if (res == AVAILABLE) {
+            int config = com.android.internal.R.bool.config_usbPortSecuritySupported;
+            if (!mContext.getResources().getBoolean(config)) {
+                res = UNSUPPORTED_ON_DEVICE;
+            }
+        }
+        return res;
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        boolean pogo = appliesToPogoPins;
+
+        Resources res = mContext.getResources();
+        entries.add(pogo ? R.string.usbc_port_and_pogo_pins_off_title : R.string.usbc_port_off_title,
+                pogo ? R.string.usbc_port_and_pogo_pins_off_summary : R.string.usbc_port_off_summary,
+                UsbPortSecurity.MODE_ALL_PORTS_DISABLED);
+        entries.add(R.string.usbc_port_charging_only_title,
+                pogo ? R.string.usbc_port_and_pogo_pins_charging_only_summary : R.string.usbc_port_charging_only_summary,
+                UsbPortSecurity.MODE_CHARGING_ONLY);
+
+        String title = res.getString(R.string.usbc_port_charging_only_when_locked_title);
+        CharSequence summary = res.getText(pogo ?
+                R.string.usbc_port_and_pogo_pins_charging_only_when_locked_summary :
+                R.string.usbc_port_charging_only_when_locked_summary);
+        entries.add(title, summary,
+                UsbPortSecurity.MODE_CHARGING_ONLY_WHEN_LOCKED);
+
+        CharSequence titleAfu = res.getText(R.string.usbc_port_charging_only_when_locked_afu_title);
+        String summaryAfu = res.getString(R.string.usbc_port_charging_only_when_locked_afu_summary, title);
+        entries.add(titleAfu, summaryAfu,
+                UsbPortSecurity.MODE_CHARGING_ONLY_WHEN_LOCKED_AFU);
+
+        entries.add(R.string.usbc_port_on_title, R.string.usbc_port_on_summary,
+                UsbPortSecurity.MODE_ALL_PORTS_ENABLED);
+    }
+
+    @Override
+    protected boolean setValue(int val) {
+        var usbManager = requireNonNull(mContext.getSystemService(UsbManager.class));
+        usbManager.updatePortSecuritySetting(val);
+        return true;
+    }
+
+    @Override
+    protected boolean isCredentialConfirmationRequired() {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/BiometricSecondFactorPinSettings.java b/src/com/android/settings/security/screenlock/BiometricSecondFactorPinSettings.java
new file mode 100644
index 00000000000..832d08a28b1
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/BiometricSecondFactorPinSettings.java
@@ -0,0 +1,182 @@
+package com.android.settings.security.screenlock;
+
+import static android.app.Activity.RESULT_FIRST_USER;
+import static com.android.internal.widget.LockDomain.Secondary;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.WrappedLockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseBiometricSecondFactorPin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fragment that allows the user to configure the settings of their biometric second factor PIN.
+ * Based on upstream's ScreenLockSettings.
+ */
+public class BiometricSecondFactorPinSettings extends DashboardFragment
+        implements DeleteBiometricSecondFactorPinPreferenceController.DeleteConfirmedCallback {
+
+    private static final String TAG = "BiometricSecondFactorPinSettings";
+
+    public static final int REQUEST_CHANGE_PIN = 1;
+
+    public static final int RESULT_NOT_FOREGROUND = RESULT_FIRST_USER;
+
+    private static final String EXTRA_PRIMARY_CREDENTIAL = "primary_credential";
+    // Not using Intent.EXTRA_USER_ID as we want to make this private to force use of the
+    // IntentBuilder.
+    private static final String EXTRA_USER_ID = "user_id";
+
+    private DeleteBiometricSecondFactorPinPreferenceController
+            mDeleteBiometricSecondFactorPinPreferenceController;
+
+    private boolean mLaunchedChooseBiometricSecondFactorPin;
+
+    private int mUserId;
+    private LockscreenCredential mPrimaryCredential;
+
+    public static class IntentBuilder {
+
+        private final SubSettingLauncher mLauncher;
+        private final Bundle mExtras;
+
+
+        public IntentBuilder(Context context) {
+            mLauncher = new SubSettingLauncher(context);
+            mLauncher.setDestination(BiometricSecondFactorPinSettings.class.getName());
+            mExtras = new Bundle();
+            mLauncher.setExtras(mExtras);
+        }
+
+        public IntentBuilder setUserId(int userId) {
+            mExtras.putInt(EXTRA_USER_ID, userId);
+            return this;
+        }
+
+        public IntentBuilder setPrimaryCredential(LockscreenCredential primaryCredential) {
+            mExtras.putParcelable(EXTRA_PRIMARY_CREDENTIAL, primaryCredential);
+            return this;
+        }
+
+        public IntentBuilder setSourceMetricsCateogry(int sourceMetricsCateogry) {
+            mLauncher.setSourceMetricsCategory(sourceMetricsCateogry);
+            return this;
+        }
+
+        public Intent build() {
+            return mLauncher.toIntent();
+        }
+    }
+
+    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+            DashboardFragment parent, LockPatternUtils lockPatternUtils,
+            LockscreenCredential primaryCredential, int userId) {
+
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new PinPrivacyPreferenceController(context, userId,
+                new WrappedLockPatternUtils(lockPatternUtils, Secondary)));
+        controllers.add(new PinScramblingPrefController(context, Secondary));
+        controllers.add(new DeleteBiometricSecondFactorPinPreferenceController(context, parent,
+                userId, primaryCredential));
+        controllers.add(new ChangeBiometricSecondFactorPinPreferenceController(context, parent,
+                userId, REQUEST_CHANGE_PIN, primaryCredential));
+
+        return controllers;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        LockPatternUtils lpu = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(getContext());
+        List<AbstractPreferenceController> controllers =  buildPreferenceControllers(context,
+                this /* parent */, lpu, mPrimaryCredential, mUserId);
+
+        for (AbstractPreferenceController controller : controllers) {
+            if (controller.getPreferenceKey() ==
+                    DeleteBiometricSecondFactorPinPreferenceController.PREF_KEY) {
+                mDeleteBiometricSecondFactorPinPreferenceController =
+                        (DeleteBiometricSecondFactorPinPreferenceController) controller;
+            }
+        }
+
+        return controllers;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.biometric_second_factor_pin_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.PAGE_UNKNOWN;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        // These must be set here so that #createPreferenceControllers can access them.
+        mPrimaryCredential = getIntent().getParcelableExtra(
+                EXTRA_PRIMARY_CREDENTIAL, LockscreenCredential.class);
+        mUserId = getIntent().getIntExtra(EXTRA_USER_ID, -1);
+
+        super.onAttach(context);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (!getActivity().isChangingConfigurations() && !mLaunchedChooseBiometricSecondFactorPin) {
+            setResult(RESULT_NOT_FOREGROUND);
+            finish();
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference pref) {
+        String key = pref.getKey();
+        if (ChangeBiometricSecondFactorPinPreferenceController.PREF_KEY.equals(key)) {
+            mLaunchedChooseBiometricSecondFactorPin = true;
+        }
+        return super.onPreferenceTreeClick(pref);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CHANGE_PIN) {
+            mLaunchedChooseBiometricSecondFactorPin = false;
+            if (resultCode == ChooseBiometricSecondFactorPin
+                    .ChooseBiometricSecondFactorPinFragment.RESULT_NOT_FOREGROUND) {
+                setResult(RESULT_NOT_FOREGROUND);
+                finish();
+            }
+        }
+    }
+
+    @Override
+    public void onBiometricSecondFactorPinDeleteConfirmed() {
+        mDeleteBiometricSecondFactorPinPreferenceController
+                .onBiometricSecondFactorPinDeleteConfirmed();
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/ChangeBiometricSecondFactorPinPreferenceController.java b/src/com/android/settings/security/screenlock/ChangeBiometricSecondFactorPinPreferenceController.java
new file mode 100644
index 00000000000..1b2f37dd666
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/ChangeBiometricSecondFactorPinPreferenceController.java
@@ -0,0 +1,80 @@
+package com.android.settings.security.screenlock;
+
+import static com.android.internal.widget.LockDomain.Secondary;
+
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseBiometricSecondFactorPin;
+
+/**
+ * Controller for launching an Activity to allow the user to choose a new biometric second factor
+ * PIN.
+ */
+public class ChangeBiometricSecondFactorPinPreferenceController extends BasePreferenceController {
+
+    public static final String PREF_KEY = "change_pin";
+
+    private final Fragment mHost;
+
+    private final LockPatternUtils mLockPatternUtils;
+
+    // The result that mHost's Activity will return to indicate that the user requested a change of
+    // PIN.
+    private final int mChangePinRequestCode;
+
+    private final int mUserId;
+    private final LockscreenCredential mPrimaryCredential;
+
+    public ChangeBiometricSecondFactorPinPreferenceController(Context context, Fragment host,
+            int userId, int changePinRequestCode, LockscreenCredential primaryCredential) {
+        super(context, PREF_KEY);
+        mHost = host;
+        mUserId = userId;
+        mChangePinRequestCode = changePinRequestCode;
+        mPrimaryCredential = primaryCredential;
+        mLockPatternUtils = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mLockPatternUtils.isSecure(mUserId, Secondary)) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    public void launchChoose() {
+        mHost.startActivityForResult(getChooseIntent(), mChangePinRequestCode);
+    }
+
+    private Intent getChooseIntent() {
+        ChooseBiometricSecondFactorPin.IntentBuilder builder =
+                new ChooseBiometricSecondFactorPin.IntentBuilder(mContext)
+                        .setUserId(mUserId)
+                        .setPrimaryCredential(mPrimaryCredential);
+
+        return builder.build();
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return super.handlePreferenceTreeClick(preference);
+        }
+
+        launchChoose();
+
+        return true;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/DeleteBiometricSecondFactorPinPreferenceController.java b/src/com/android/settings/security/screenlock/DeleteBiometricSecondFactorPinPreferenceController.java
new file mode 100644
index 00000000000..1f11ecc4aa1
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/DeleteBiometricSecondFactorPinPreferenceController.java
@@ -0,0 +1,138 @@
+package com.android.settings.security.screenlock;
+
+import static com.android.internal.widget.LockDomain.Secondary;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockscreenCredential;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Controller for deleting a user's biometric second factor PIN after they confirm the delete by
+ * way of confirmation dialog.
+ */
+public class DeleteBiometricSecondFactorPinPreferenceController extends BasePreferenceController {
+
+    public static final String PREF_KEY = "delete_pin";
+
+    public static final String TAG_DELETE_BIOMETRIC_SECOND_FACTOR_PIN_CONFIRM_DIALOG =
+            "delete_biometric_second_factor_pin_confirm_dialog";
+
+    private final Fragment mHost;
+
+    private final LockPatternUtils mLockPatternUtils;
+
+    private final int mUserId;
+    private final LockscreenCredential mPrimaryCredential;
+
+    public interface DeleteConfirmedCallback {
+        void onBiometricSecondFactorPinDeleteConfirmed();
+    }
+
+    public DeleteBiometricSecondFactorPinPreferenceController(Context context, Fragment host,
+            int userId, LockscreenCredential primaryCredential) {
+        super(context, PREF_KEY);
+        mHost = host;
+        mUserId = userId;
+        mPrimaryCredential = primaryCredential;
+        mLockPatternUtils = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mLockPatternUtils.isSecure(mUserId, Secondary)) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    public void onBiometricSecondFactorPinDeleteConfirmed() {
+        mLockPatternUtils.setLockCredential(
+                LockscreenCredential.createNone(), mPrimaryCredential, Secondary, mUserId);
+        mHost.getActivity().setResult(Activity.RESULT_OK);
+        mHost.getActivity().finish();
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return super.handlePreferenceTreeClick(preference);
+        }
+
+        DeleteBiometricSecondFactorPinConfirmationDialog.newInstance(
+                R.string.biometric_second_factor_pin_delete_confirmation_dialog_title,
+                R.string.biometric_second_factor_pin_delete_confirmation_dialog_message)
+                .show(mHost.getChildFragmentManager(),
+                        TAG_DELETE_BIOMETRIC_SECOND_FACTOR_PIN_CONFIRM_DIALOG);
+
+        return true;
+    }
+
+    /**
+     * Dialog for confirming that the user wants to delete their biometric second factor PIN.
+     * Based on upstream's ChooseLockGeneric.FactoryResetProtectionWarningDialog.
+     */
+    public static class DeleteBiometricSecondFactorPinConfirmationDialog
+            extends InstrumentedDialogFragment {
+
+        private static final String ARG_TITLE_RES = "titleRes";
+        private static final String ARG_MESSAGE_RES = "messageRes";
+
+        public static DeleteBiometricSecondFactorPinConfirmationDialog newInstance(
+                int titleRes, int messageRes) {
+            DeleteBiometricSecondFactorPinConfirmationDialog frag =
+                    new DeleteBiometricSecondFactorPinConfirmationDialog();
+            Bundle args = new Bundle();
+            args.putInt(ARG_TITLE_RES, titleRes);
+            args.putInt(ARG_MESSAGE_RES, messageRes);
+            frag.setArguments(args);
+            return frag;
+        }
+
+        @Override
+        public void show(FragmentManager manager, String tag) {
+            if (manager.findFragmentByTag(tag) == null) {
+                // Prevent opening multiple dialogs if tapped on button quickly
+                super.show(manager, tag);
+            }
+        }
+
+        @NonNull
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Bundle args = getArguments();
+
+            return new AlertDialog.Builder(getActivity())
+                    .setTitle(args.getInt(ARG_TITLE_RES))
+                    .setMessage(args.getInt(ARG_MESSAGE_RES))
+                    .setPositiveButton(
+                            R.string.biometric_second_factor_pin_delete_confirmation_dialog_positive_button,
+                            (dialog, whichButton) -> ((DeleteConfirmedCallback) getParentFragment())
+                                    .onBiometricSecondFactorPinDeleteConfirmed())
+                    .setNegativeButton(R.string.cancel, (dialog, whichButton) -> dismiss())
+                    .create();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return SettingsEnums.PAGE_UNKNOWN;
+        }
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/PinPrivacyPreferenceController.kt b/src/com/android/settings/security/screenlock/PinPrivacyPreferenceController.kt
index 78656e88416..626a2b29bff 100644
--- a/src/com/android/settings/security/screenlock/PinPrivacyPreferenceController.kt
+++ b/src/com/android/settings/security/screenlock/PinPrivacyPreferenceController.kt
@@ -20,15 +20,15 @@ import android.content.Context
 import android.provider.Settings
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import com.android.internal.widget.LockPatternUtils
 import com.android.internal.widget.LockPatternUtils.*
+import com.android.internal.widget.WrappedLockPatternUtils
 import com.android.settings.core.PreferenceControllerMixin
 import com.android.settingslib.core.AbstractPreferenceController
 
 class PinPrivacyPreferenceController(
     context: Context,
     private val userId: Int,
-    private val lockPatternUtils: LockPatternUtils
+    private val lockPatternUtils: WrappedLockPatternUtils,
 ) : AbstractPreferenceController(context), PreferenceControllerMixin,
     Preference.OnPreferenceChangeListener {
 
diff --git a/src/com/android/settings/security/screenlock/PinScramblingPrefController.java b/src/com/android/settings/security/screenlock/PinScramblingPrefController.java
new file mode 100644
index 00000000000..66db573a5d5
--- /dev/null
+++ b/src/com/android/settings/security/screenlock/PinScramblingPrefController.java
@@ -0,0 +1,41 @@
+package com.android.settings.security.screenlock;
+
+import static com.android.internal.widget.LockDomain.Primary;
+
+import android.content.Context;
+import android.ext.settings.ExtSettings;
+
+import com.android.internal.widget.LockDomain;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.ext.BoolSettingPrefController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class PinScramblingPrefController extends BoolSettingPrefController {
+
+    private final LockPatternUtils mLockPatternUtils;
+    private final LockDomain mLockDomain;
+
+    static final String PREF_KEY = "scramble_pin_layout";
+
+    public PinScramblingPrefController(Context ctx, LockDomain lockDomain) {
+        super(ctx, PREF_KEY, lockDomain == Primary ?
+                ExtSettings.SCRAMBLE_LOCKSCREEN_PIN_LAYOUT_PRIMARY :
+                ExtSettings.SCRAMBLE_LOCKSCREEN_PIN_LAYOUT_SECONDARY);
+        mLockDomain = lockDomain;
+        mLockPatternUtils = FeatureFactory.getFeatureFactory()
+                .getSecurityFeatureProvider()
+                .getLockPatternUtils(ctx);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        int res = super.getAvailabilityStatus();
+        if (res == AVAILABLE) {
+            if (mLockPatternUtils.getCredentialTypeForUser(mContext.getUserId(), mLockDomain)
+                    != LockPatternUtils.CREDENTIAL_TYPE_PIN) {
+                return CONDITIONALLY_UNAVAILABLE;
+            }
+        }
+        return res;
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
index 1c66b711382..88cb4a66470 100644
--- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java
+++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.security.screenlock;
 
+import static com.android.internal.widget.LockDomain.Primary;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -25,6 +27,7 @@
 import androidx.annotation.Nullable;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.WrappedLockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -81,7 +84,7 @@ private static List<AbstractPreferenceController> buildPreferenceControllers(Con
         controllers.add(new PatternVisiblePreferenceController(
                 context, MY_USER_ID, lockPatternUtils));
         controllers.add(new PinPrivacyPreferenceController(
-                context, MY_USER_ID, lockPatternUtils));
+                context, MY_USER_ID, new WrappedLockPatternUtils(lockPatternUtils, Primary)));
         controllers.add(new PowerButtonInstantLockPreferenceController(
                 context, MY_USER_ID, lockPatternUtils));
         controllers.add(new LockAfterTimeoutPreferenceController(
@@ -89,6 +92,7 @@ private static List<AbstractPreferenceController> buildPreferenceControllers(Con
         controllers.add(new AutoPinConfirmPreferenceController(
                 context, MY_USER_ID, lockPatternUtils, parent));
         controllers.add(new OwnerInfoPreferenceController(context, parent));
+        controllers.add(new PinScramblingPrefController(context, Primary));
         return controllers;
     }
 
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index ce95004f34d..51a467cdaf4 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -101,6 +101,15 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
         listOf(
             HomePageProvider,
             AppsMainPageProvider,
+            com.android.settings.applications.AswAdapterUseHardenedMalloc.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterUseMemoryTagging.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterUseExtendedVaSpace.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterNativeDebugging.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterWebViewDynCodeLoading.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterMemoryDynCodeLoading.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterStorageDynCodeLoading.makeAppListPageProvider(),
+            com.android.settings.applications.AswAdapterManagePlayIntegrityApi.makeAppListPageProvider(),
+            com.android.settings.network.telephony.carriersettingsoverride.CarrierSettingsOverridesProvider,
             AllAppListPageProvider,
             AppInfoSettingsProvider,
             SpecialAppAccessPageProvider,
diff --git a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
index af4fc176940..958937a6013 100644
--- a/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
@@ -35,13 +35,12 @@ import com.android.settings.R
 import com.android.settings.Utils
 import com.android.settings.core.SubSettingLauncher
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail
-import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceController
-import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry
+import com.android.settings.fuelgauge.BatteryOptimizeUtils
+import com.android.settings.fuelgauge.PowerBackgroundUsageDetail
 import com.android.settingslib.spa.widget.preference.Preference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
 import com.android.settingslib.spaprivileged.model.app.installed
 import com.android.settingslib.spaprivileged.model.app.userHandle
-import com.android.settingslib.spaprivileged.model.app.userId
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -55,7 +54,6 @@ fun AppBatteryPreference(app: ApplicationInfo) {
     Preference(object : PreferenceModel {
         override val title = stringResource(R.string.battery_details_title)
         override val summary = presenter.summary
-        override val enabled = presenter.enabled
         override val onClick = presenter::startActivity
     })
 
@@ -63,8 +61,7 @@ fun AppBatteryPreference(app: ApplicationInfo) {
 }
 
 private class AppBatteryPresenter(private val context: Context, private val app: ApplicationInfo) {
-    private var batteryDiffEntryState: LoadingState<BatteryDiffEntry?>
-        by mutableStateOf(LoadingState.Loading)
+    private var optimizationModeState: LoadingState<Int> by mutableStateOf(LoadingState.Loading)
 
     @Composable
     fun isAvailable() = remember {
@@ -77,63 +74,39 @@ private class AppBatteryPresenter(private val context: Context, private val app:
         val current = LocalLifecycleOwner.current
         LaunchedEffect(app) {
             current.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                launch { batteryDiffEntryState = LoadingState.Done(getBatteryDiffEntry()) }
+                launch { optimizationModeState = LoadingState.Done(getBatteryDiffEntry()) }
             }
         }
     }
 
-    private suspend fun getBatteryDiffEntry(): BatteryDiffEntry? = withContext(Dispatchers.IO) {
-        BatteryChartPreferenceController.getAppBatteryUsageData(
-            context, app.packageName, app.userId
-        ).also {
-            Log.d(TAG, "loadBatteryDiffEntries():\n$it")
-        }
+    private suspend fun getBatteryDiffEntry(): Int = withContext(Dispatchers.IO) {
+        return@withContext BatteryOptimizeUtils(context, app.uid, app.packageName)
+            .getAppOptimizationMode(false, false);
     }
 
-    val enabled = { batteryDiffEntryState is LoadingState.Done }
-
     val summary = {
         if (app.installed) {
-            batteryDiffEntryState.let { batteryDiffEntryState ->
+            optimizationModeState.let { batteryDiffEntryState ->
                 when (batteryDiffEntryState) {
                     is LoadingState.Loading -> context.getString(R.string.summary_placeholder)
-                    is LoadingState.Done -> batteryDiffEntryState.result.getSummary()
+                    is LoadingState.Done -> {
+                        val optimizationMode = when (batteryDiffEntryState.result) {
+                            BatteryOptimizeUtils.MODE_RESTRICTED ->
+                                R.string.manager_battery_usage_restricted_title
+                            BatteryOptimizeUtils.MODE_UNRESTRICTED ->
+                                R.string.manager_battery_usage_unrestricted_title
+                            BatteryOptimizeUtils.MODE_OPTIMIZED ->
+                                R.string.manager_battery_usage_optimized_title
+                            else -> return@let ""
+                        }
+                        return@let context.getString(optimizationMode)
+                    }
                 }
             }
         } else ""
     }
 
-    private fun BatteryDiffEntry?.getSummary(): String =
-        this?.takeIf { mConsumePower > 0 }?.let {
-            context.getString(
-                R.string.battery_summary, Utils.formatPercentage(percentage, true)
-            )
-        } ?: context.getString(R.string.no_battery_summary)
-
     fun startActivity() {
-        batteryDiffEntryState.resultOrNull?.run {
-            startBatteryDetailPage()
-            return
-        }
-
-        fallbackStartBatteryDetailPage()
-    }
-
-    private fun BatteryDiffEntry.startBatteryDetailPage() {
-        Log.i(TAG, "handlePreferenceTreeClick():\n$this")
-        AdvancedPowerUsageDetail.startBatteryDetailPage(
-            context,
-            AppInfoSettingsProvider.METRICS_CATEGORY,
-            this,
-            Utils.formatPercentage(percentage, true),
-            /*slotInformation=*/ null,
-            /*showTimeInformation=*/ false,
-            /*anomalyHintPrefKey=*/ null,
-            /*anomalyHintText=*/ null
-        )
-    }
-
-    private fun fallbackStartBatteryDetailPage() {
         Log.i(TAG, "Launch : ${app.packageName} with package name")
         val args = bundleOf(
             AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME to app.packageName,
@@ -141,7 +114,7 @@ private class AppBatteryPresenter(private val context: Context, private val app:
             AdvancedPowerUsageDetail.EXTRA_UID to app.uid,
         )
         SubSettingLauncher(context)
-            .setDestination(AdvancedPowerUsageDetail::class.java.name)
+            .setDestination(PowerBackgroundUsageDetail::class.java.name)
             .setTitleRes(R.string.battery_details_title)
             .setArguments(args)
             .setUserHandle(app.userHandle)
diff --git a/src/com/android/settings/spa/app/appinfo/AppContactScopesPreference.kt b/src/com/android/settings/spa/app/appinfo/AppContactScopesPreference.kt
new file mode 100644
index 00000000000..be4cf6fadbc
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AppContactScopesPreference.kt
@@ -0,0 +1,32 @@
+package com.android.settings.spa.app.appinfo
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.content.pm.GosPackageStateFlag
+import android.ext.cscopes.ContactScopesApi
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spaprivileged.model.app.userHandle
+import com.android.settingslib.spaprivileged.model.app.userId
+
+@Composable
+fun AppContactScopesPreference(app: ApplicationInfo) {
+    val pkgName = app.packageName
+    if (!GosPackageState.get(pkgName, app.userId).hasFlag(GosPackageStateFlag.CONTACT_SCOPES_ENABLED)) {
+        return
+    }
+
+    val context = LocalContext.current
+
+    Preference(object : PreferenceModel {
+        override val title = stringResource(R.string.contact_scopes)
+        override val onClick = {
+            val intent = ContactScopesApi.createConfigActivityIntent(pkgName)
+            context.startActivityAsUser(intent, app.userHandle)
+        }
+    })
+}
diff --git a/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt b/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
index 555e9f14c61..07d583cde30 100644
--- a/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppDisableButton.kt
@@ -31,6 +31,7 @@ import com.android.settingslib.spa.widget.dialog.AlertDialogButton
 import com.android.settingslib.spa.widget.dialog.rememberAlertDialogPresenter
 import com.android.settingslib.spaprivileged.framework.common.devicePolicyManager
 import com.android.settingslib.spaprivileged.framework.common.userManager
+import com.android.settingslib.spaprivileged.model.app.installed
 import com.android.settingslib.spaprivileged.model.app.isDisabledUntilUsed
 import com.android.settingslib.Utils as SettingsLibUtils
 
@@ -47,7 +48,7 @@ class AppDisableButton(
 
     @Composable
     fun getActionButton(app: ApplicationInfo): ActionButton? {
-        if (!app.isSystemApp) return null
+        if (!app.installed) return null
 
         return when {
             app.enabled && !app.isDisabledUntilUsed -> {
@@ -62,6 +63,8 @@ class AppDisableButton(
      * Gets whether a package can be disabled.
      */
     private fun ApplicationInfo.canBeDisabled(): Boolean = when {
+        !isSystemApp -> appButtonRepository.isAllowUninstallOrArchive(context, this)
+
         // Try to prevent the user from bricking their phone by not allowing disabling of apps
         // signed with the system certificate.
         isSignedWithPlatformKey -> false
@@ -98,7 +101,12 @@ class AppDisableButton(
             // Currently we apply the same device policy for both the uninstallation and disable
             // button.
             if (!appButtonRepository.isUninstallBlockedByAdmin(app)) {
-                dialogPresenter.open()
+                if (app.isSystemApp) {
+                    dialogPresenter.open()
+                } else {
+                    packageInfoPresenter.disable()
+                }
+
             }
         }
     }
diff --git a/src/com/android/settings/spa/app/appinfo/AppExploitProtectionCompatModeSwitchPreference.kt b/src/com/android/settings/spa/app/appinfo/AppExploitProtectionCompatModeSwitchPreference.kt
new file mode 100644
index 00000000000..daf3ace3dba
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AppExploitProtectionCompatModeSwitchPreference.kt
@@ -0,0 +1,59 @@
+package com.android.settings.spa.app.appinfo
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.content.pm.GosPackageStateFlag
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settings.applications.AswExploitProtectionFragment
+import com.android.settingslib.spa.widget.preference.SwitchPreference
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import com.android.settingslib.spaprivileged.model.app.installed
+import com.android.settingslib.spaprivileged.model.app.userId
+
+@Composable
+fun AppExploitProtectionCompatModeSwitchPreference(app: ApplicationInfo,
+                                                   packageInfoPresenter: PackageInfoPresenter) {
+    if (app.isSystemApp || !app.installed) {
+        return
+    }
+
+    val context = LocalContext.current
+    val pkgName = app.packageName
+    val userId = app.userId
+    val psFlag = GosPackageStateFlag.ENABLE_EXPLOIT_PROTECTION_COMPAT_MODE
+
+    SwitchPreference(object : SwitchPreferenceModel {
+        override val title = stringResource(R.string.aep_compat_mode_title)
+        override val summary = {
+            context.getString(R.string.aep_compat_mode_summary)
+        }
+
+        override val checked = {
+            GosPackageState.get(pkgName, userId).hasFlag(psFlag)
+        }
+
+        override val onCheckedChange = { newChecked: Boolean ->
+            val action = Runnable {
+                GosPackageState.edit(pkgName, userId).run {
+                    setFlagState(psFlag, newChecked)
+                    killUidAfterApply()
+                    if (apply()) {
+                        // needed to recompose other exploit protection settings
+                        check(packageInfoPresenter.manualRefreshFlow.tryEmit(Any()))
+                    }
+                }
+            }
+
+            if (newChecked) {
+                val d = AswExploitProtectionFragment.getExploitProtectionWarningOnDisable(context, action)
+                d.show()
+            } else {
+                action.run()
+            }
+            Unit
+        }
+    })
+}
diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index 2004757ed03..e1fcc522e1b 100644
--- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -46,6 +46,7 @@ import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider
 import com.android.settings.spa.app.specialaccess.UsageDataAppListProvider
 import com.android.settings.spa.app.specialaccess.WriteSystemPreferencesAppListProvider
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.compose.LifecycleEffect
 import com.android.settingslib.spa.framework.compose.navigator
 import com.android.settingslib.spa.widget.scaffold.RegularScaffold
 import com.android.settingslib.spa.widget.ui.Category
@@ -121,6 +122,8 @@ object AppInfoSettingsProvider : SettingsPageProvider {
 
 @Composable
 private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
+    // needed to refresh AppSwitch items after returning from their fragments
+    LifecycleEffect(onStart = { check(packageInfoPresenter.manualRefreshFlow.tryEmit(Any())) })
     val packageInfoState = packageInfoPresenter.flow.collectAsStateWithLifecycle()
     val featureFlags: PmFeatureFlags = PmFeatureFlagsImpl()
     RegularScaffold(
@@ -149,6 +152,8 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
             AppPermissionPreference(app)
             ManageTargetAppFunctionAccessPreference(app)
             ManageAgentAppFunctionAccessPreference(app)
+            AppStorageScopesPreference(app)
+            AppContactScopesPreference(app)
             AppStoragePreference(app)
             InstantAppDomainsPreference(app)
             AppDataUsagePreference(app)
@@ -157,6 +162,7 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
             AppLocalePreference(app)
             AppOpenByDefaultPreference(app)
             DefaultAppShortcuts(app)
+            AppLogcatPreference(app)
         }
 
         Category(title = stringResource(R.string.unused_apps_category)) {
@@ -164,6 +170,7 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
         }
 
         Category(title = stringResource(R.string.advanced_apps)) {
+            com.android.settings.applications.AppManagePlayIntegrityApiPreference(app)
             UserAspectRatioAppPreference(app)
             DisplayOverOtherAppsAppListProvider.InfoPageEntryItem(app)
             ModifySystemSettingsAppListProvider.InfoPageEntryItem(app)
@@ -176,6 +183,17 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
             UsageDataAppListProvider.InfoPageEntryItem(app)
         }
 
+        Category(title = stringResource(R.string.exploit_protection_category_title)) {
+            AppExploitProtectionCompatModeSwitchPreference(app, packageInfoPresenter)
+            com.android.settings.applications.AppHardenedMallocPreference(app)
+            com.android.settings.applications.AppMemtagPreference(app)
+            com.android.settings.applications.AppExtendedVaSpacePreference(app)
+            com.android.settings.applications.AppNativeDebuggingPreference(app)
+            com.android.settings.applications.AppWebViewDynCodeLoadingPreference(app)
+            com.android.settings.applications.AppMemoryDynCodeLoadingPreference(app)
+            com.android.settings.applications.AppStorageDynCodeLoadingPreference(app)
+        }
+
         Category(title = stringResource(R.string.app_install_details_group_title)) {
             AppInstallerInfoPreference(app)
         }
diff --git a/src/com/android/settings/spa/app/appinfo/AppLogcatPreference.kt b/src/com/android/settings/spa/app/appinfo/AppLogcatPreference.kt
new file mode 100644
index 00000000000..14e3c60b5e1
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AppLogcatPreference.kt
@@ -0,0 +1,29 @@
+package com.android.settings.spa.app.appinfo
+
+import android.content.pm.ApplicationInfo
+import android.ext.LogViewerApp
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spaprivileged.model.app.installed
+import com.android.settingslib.spaprivileged.model.app.userHandle
+
+@Composable
+fun AppLogcatPreference(app: ApplicationInfo) {
+    if (!app.installed) {
+        return
+    }
+
+    val context = LocalContext.current
+
+    Preference(object : PreferenceModel {
+        override val title = stringResource(R.string.view_logs)
+        override val onClick = {
+            val intent = LogViewerApp.getPackageLogcatIntent(app.packageName)
+            context.startActivityAsUser(intent, app.userHandle)
+        }
+    })
+}
diff --git a/src/com/android/settings/spa/app/appinfo/AppStorageScopesPreference.kt b/src/com/android/settings/spa/app/appinfo/AppStorageScopesPreference.kt
new file mode 100644
index 00000000000..cbcd8944f56
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AppStorageScopesPreference.kt
@@ -0,0 +1,32 @@
+package com.android.settings.spa.app.appinfo
+
+import android.app.StorageScope
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.content.pm.GosPackageStateFlag
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spaprivileged.model.app.userHandle
+import com.android.settingslib.spaprivileged.model.app.userId
+
+@Composable
+fun AppStorageScopesPreference(app: ApplicationInfo) {
+    val pkgName = app.packageName
+    if (!GosPackageState.get(pkgName, app.userId).hasFlag(GosPackageStateFlag.STORAGE_SCOPES_ENABLED)) {
+        return
+    }
+
+    val context = LocalContext.current
+
+    Preference(object : PreferenceModel {
+        override val title = stringResource(R.string.storage_scopes)
+        override val onClick = {
+            val intent = StorageScope.createConfigActivityIntent(pkgName)
+            context.startActivityAsUser(intent, app.userHandle)
+        }
+    })
+}
diff --git a/src/com/android/settings/spa/app/appinfo/AswAppList.kt b/src/com/android/settings/spa/app/appinfo/AswAppList.kt
new file mode 100644
index 00000000000..c08586a7002
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AswAppList.kt
@@ -0,0 +1,101 @@
+package com.android.settings.spa.app.appinfo
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.android.settings.applications.AswAdapter
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.compose.rememberContext
+import com.android.settingslib.spa.framework.util.asyncFilter
+import com.android.settingslib.spa.framework.util.asyncMap
+import com.android.settingslib.spa.widget.ui.SpinnerOption
+import com.android.settingslib.spaprivileged.model.app.AppListModel
+import com.android.settingslib.spaprivileged.model.app.AppRecord
+import com.android.settingslib.spaprivileged.template.app.AppListItem
+import com.android.settingslib.spaprivileged.template.app.AppListItemModel
+import com.android.settingslib.spaprivileged.template.app.AppListPage
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+
+open class AswAppListPageProvider(val adapter: AswAdapter<*>) : SettingsPageProvider {
+    override val name = adapter.getAppListPageProviderName()
+
+    @Composable
+    override fun Page(arguments: Bundle?) {
+        AswAppListPage(adapter)
+    }
+}
+
+@Composable
+fun AswAppListPage(adapter: AswAdapter<*>) {
+    AppListPage(
+        title = rememberContext { ctx ->
+            adapter.getShortAswTitle(ctx).toString()
+        },
+        listModel = rememberContext { ctx ->
+            AswAppListModel(ctx, adapter)
+        },
+    )
+}
+
+class AppRecordImpl(override val app: ApplicationInfo, val gosPackageState: GosPackageState) : AppRecord
+
+class AswAppListModel(val ctx: Context, val adapter: AswAdapter<*>) : AppListModel<AppRecordImpl> {
+    companion object {
+        const val SPINNER_OPTION_OFF = 0
+        const val SPINNER_OPTION_ON = 1
+    }
+
+    override fun getSpinnerOptions(recordList: List<AppRecordImpl>): List<SpinnerOption> {
+        val options = ArrayList<SpinnerOption>(2)
+        options.add(SpinnerOption(SPINNER_OPTION_OFF, adapter.getOffTitle(ctx).toString()))
+        options.add(SpinnerOption(SPINNER_OPTION_ON, adapter.getOnTitle(ctx).toString()))
+        return options
+    }
+
+    override fun transform(
+        userIdFlow: Flow<Int>,
+        appListFlow: Flow<List<ApplicationInfo>>
+    ): Flow<List<AppRecordImpl>> {
+        return userIdFlow.combine(appListFlow) { userId, appList ->
+            appList.asyncMap { app ->
+                val gosPs = GosPackageState.get(app.packageName, userId)
+                if (adapter.shouldIncludeInAppListPage(app, gosPs)) {
+                    AppRecordImpl(app, GosPackageState.get(app.packageName, userId))
+                } else {
+                    null
+                }
+            }.filterNotNull()
+        }
+    }
+
+    override fun filter(
+        userIdFlow: Flow<Int>,
+        option: Int,
+        recordListFlow: Flow<List<AppRecordImpl>>
+    ): Flow<List<AppRecordImpl>> {
+        val appSwitch = adapter.getAppSwitch()
+        return userIdFlow.combine(recordListFlow) { userId, recordList ->
+            recordList.asyncFilter {
+                val value = appSwitch.get(ctx, userId, it.app, it.gosPackageState)
+                when (option) {
+                    SPINNER_OPTION_OFF -> !value
+                    SPINNER_OPTION_ON -> value
+                    else -> throw IllegalArgumentException(option.toString())
+                }
+            }
+        }
+    }
+
+    @Composable
+    override fun AppListItemModel<AppRecordImpl>.AppItem() {
+        val context = LocalContext.current
+        AppListItem(onClick = {
+            adapter.openAppPage(context, record.app)
+        })
+    }
+}
+
diff --git a/src/com/android/settings/spa/app/appinfo/AswPreference.kt b/src/com/android/settings/spa/app/appinfo/AswPreference.kt
new file mode 100644
index 00000000000..116fa047025
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AswPreference.kt
@@ -0,0 +1,27 @@
+package com.android.settings.spa.app.appinfo
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.ext.settings.app.AppSwitch
+import androidx.compose.runtime.Composable
+import com.android.settings.applications.AswAdapter
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spaprivileged.model.app.installed
+
+@Composable
+fun AswPreference(context: Context, app: ApplicationInfo, adapter: AswAdapter<out AppSwitch>) {
+    if (!app.installed) {
+        return
+    }
+
+    Preference(object : PreferenceModel {
+        override val title = adapter.getAswTitle(context).toString()
+        override val summary = {
+            adapter.getPreferenceSummary(context, app).toString()
+        }
+        override val onClick = {
+            adapter.openAppPage(context, app)
+        }
+    })
+}
diff --git a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
index 8785fe821af..a08e6b6e740 100644
--- a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
+++ b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
@@ -44,6 +44,7 @@ import com.android.settingslib.spaprivileged.model.app.IPackageManagers
 import com.android.settingslib.spaprivileged.model.app.PackageManagers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filter
@@ -96,7 +97,9 @@ class PackageInfoPresenter(
         intent.action != Intent.ACTION_PACKAGE_REMOVED ||
             intent.getBooleanExtra(Intent.EXTRA_ARCHIVAL, false)
 
-    val flow: StateFlow<PackageInfo?> = merge(flowOf(null), appChangeFlow)
+    val manualRefreshFlow = MutableStateFlow<Any?>(null)
+
+    val flow: StateFlow<PackageInfo?> = merge(flowOf(null), appChangeFlow, manualRefreshFlow)
         .map { getPackageInfo() }
         .stateIn(coroutineScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
diff --git a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
index 5c27f5bfad0..b9531f90f1d 100644
--- a/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
+++ b/src/com/android/settings/spa/app/battery/BatteryOptimizationModeAppListPageProvider.kt
@@ -156,8 +156,8 @@ class BatteryOptimizationModeAppListModel(
 }
 
 private enum class OptimizationModeSpinnerItem(val stringResId: Int) {
-    All(R.string.filter_all_apps),
-    Restricted(R.string.filter_battery_restricted_title),
+    Unrestricted(R.string.filter_battery_unrestricted_title),
     Optimized(R.string.filter_battery_optimized_title),
-    Unrestricted(R.string.filter_battery_unrestricted_title);
+    Restricted(R.string.filter_battery_restricted_title),
+    All(R.string.filter_all_apps);
 }
diff --git a/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt b/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
index f6c08c0ca7c..6dba4817a2a 100644
--- a/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
+++ b/src/com/android/settings/spa/app/specialaccess/AllFilesAccess.kt
@@ -18,11 +18,19 @@ package com.android.settings.spa.app.specialaccess
 
 import android.Manifest
 import android.app.AppOpsManager
+import android.app.StorageScope
 import android.app.settings.SettingsEnums
 import android.content.Context
+import android.content.pm.PackageInfo
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import com.android.settings.R
 import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
 import com.android.settingslib.spaprivileged.model.app.AppOps
+import com.android.settingslib.spaprivileged.model.app.userHandle
 import com.android.settingslib.spaprivileged.template.app.AppOpPermissionListModel
 import com.android.settingslib.spaprivileged.template.app.AppOpPermissionRecord
 import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider
@@ -54,4 +62,18 @@ class AllFilesAccessListModel(context: Context) : AppOpPermissionListModel(conte
         }
         featureFactory.metricsFeatureProvider.action(context, category, "")
     }
+
+    @Composable
+    override fun extContent(record: AppOpPermissionRecord, pkgInfo: PackageInfo) {
+        val context = LocalContext.current
+
+        Preference(object : PreferenceModel {
+            override val title = stringResource(R.string.storage_scopes)
+            override val onClick = {
+                val app = record.app
+                val i = StorageScope.createConfigActivityIntent(app.packageName)
+                context.startActivityAsUser(i, app.userHandle)
+            }
+        })
+    }
 }
diff --git a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
index d6fe7160dbf..0a3d5219bc9 100644
--- a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
+++ b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
@@ -22,10 +22,18 @@ import android.app.AppOpsManager
 import android.app.AppOpsManager.MODE_DEFAULT
 import android.content.Context
 import android.content.pm.ApplicationInfo
+import android.content.pm.GosPackageState
+import android.content.pm.GosPackageStateFlag
+import android.content.pm.PackageInfo
 import android.os.UserManager
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import com.android.settings.R
 import com.android.settingslib.spa.lifecycle.collectAsCallbackWithLifecycle
+import com.android.settingslib.spa.widget.preference.SwitchPreference
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
 import com.android.settingslib.spaprivileged.model.app.AppOps
 import com.android.settingslib.spaprivileged.model.app.AppOpsController
 import com.android.settingslib.spaprivileged.model.app.AppRecord
@@ -44,7 +52,26 @@ object InstallUnknownAppsListProvider : TogglePermissionAppListProvider {
 data class InstallUnknownAppsRecord(
     override val app: ApplicationInfo,
     val appOpsController: AppOpsController,
-) : AppRecord
+) : AppRecord {
+    val isObbFlagSet = mutableStateOf(isObbFlagSet())
+
+    fun isObbFlagSet(): Boolean {
+        return GosPackageState.get(app.packageName, app.userId).hasFlag(GosPackageStateFlag.ALLOW_ACCESS_TO_OBB_DIRECTORY)
+    }
+
+    fun setObbFlagState(state: Boolean): Boolean {
+        GosPackageState.edit(app.packageName, app.userId).run {
+            setFlagState(GosPackageStateFlag.ALLOW_ACCESS_TO_OBB_DIRECTORY, state)
+            killUidAfterApply()
+            if (apply()) {
+                isObbFlagSet.value = state
+                return true
+            } else {
+                return false
+            }
+        }
+    }
+}
 
 class InstallUnknownAppsListModel(private val context: Context) :
     TogglePermissionAppListModel<InstallUnknownAppsRecord> {
@@ -84,6 +111,29 @@ class InstallUnknownAppsListModel(private val context: Context) :
 
     override fun setAllowed(record: InstallUnknownAppsRecord, newAllowed: Boolean) {
         record.appOpsController.setAllowed(newAllowed)
+        if (!newAllowed) {
+            record.setObbFlagState(false)
+        }
+    }
+
+    @Composable
+    override fun extContent(record: InstallUnknownAppsRecord, pkgInfo: PackageInfo) {
+        val context = LocalContext.current
+
+        SwitchPreference(object : SwitchPreferenceModel {
+            override val title = stringResource(R.string.allow_access_to_obb_directory_title)
+            override val summary = {
+                context.getString(R.string.allow_access_to_obb_directory_summary)
+            }
+
+            override val checked = {
+                record.isObbFlagSet.value
+            }
+            override val onCheckedChange = { newChecked: Boolean ->
+                record.setObbFlagState(newChecked)
+                Unit
+            }
+        })
     }
 
     companion object {
diff --git a/src/com/android/settings/sudconfig/NonRelationalProvider.kt b/src/com/android/settings/sudconfig/NonRelationalProvider.kt
new file mode 100644
index 00000000000..5a77d8b1b3d
--- /dev/null
+++ b/src/com/android/settings/sudconfig/NonRelationalProvider.kt
@@ -0,0 +1,51 @@
+package com.android.settings.sudconfig
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+
+/**
+ * Useful for implementing content provider interfaces that are exclusively for non-relational
+ * (non-tabular) models. This reduces the boilerplate code by providing empty implementations for
+ * methods which are unneeded in non-relational models.
+ *
+ * @see [ContentProvider.call]
+ */
+abstract class NonRelationalProvider : ContentProvider() {
+
+    final override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?
+    ): Cursor? {
+        throw UnsupportedOperationException()
+    }
+
+    final override fun getType(uri: Uri): String? {
+        throw UnsupportedOperationException()
+    }
+
+    final override fun insert(uri: Uri, values: ContentValues?): Uri? {
+        throw UnsupportedOperationException()
+    }
+
+    final override fun delete(
+        uri: Uri,
+        selection: String?,
+        selectionArgs: Array<out String>?
+    ): Int {
+        throw UnsupportedOperationException()
+    }
+
+    final override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?
+    ): Int {
+        throw UnsupportedOperationException()
+    }
+}
diff --git a/src/com/android/settings/sudconfig/SudConfigProvider.kt b/src/com/android/settings/sudconfig/SudConfigProvider.kt
new file mode 100644
index 00000000000..1e19f7cec36
--- /dev/null
+++ b/src/com/android/settings/sudconfig/SudConfigProvider.kt
@@ -0,0 +1,87 @@
+package com.android.settings.sudconfig
+
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.text.TextUtils
+import android.util.Log
+import com.android.settings.R;
+import java.util.Optional
+
+/**
+ * Provides system-wide config for setup wizard screens.
+ */
+class SudConfigProvider : NonRelationalProvider() {
+    companion object {
+        private const val TAG = "SudConfigProvider"
+
+        // resources to be forwarded via overlay config
+        private val overlayConfigResources = arrayOf(
+            R.dimen.setup_design_card_view_intrinsic_height,
+            R.dimen.setup_design_card_view_intrinsic_width,
+            R.bool.setup_compat_light_navigation_bar,
+            R.bool.setup_compat_light_status_bar,
+            R.color.setup_compat_footer_primary_button_bg_color,
+            R.dimen.setup_compat_footer_button_radius,
+            R.fraction.setup_compat_footer_button_ripple_alpha
+        )
+    }
+
+    private lateinit var defaultThemeString: String
+
+    override fun onCreate(): Boolean {
+        // returns value of setupwizard.theme sysprop
+        val theme: Optional<String> = android.sysprop.SetupWizardProperties.theme()
+        if (theme.isPresent) {
+            defaultThemeString = theme.get()
+        } else {
+            // Allows tests to run without having to manually set this.
+            defaultThemeString = "fallback"
+        }
+        return true
+    }
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle {
+        Log.d(TAG, "method: $method, caller: $callingPackage")
+        val bundle = Bundle()
+        when (method) {
+            "suwDefaultThemeString" -> bundle.putString(method, defaultThemeString)
+
+            "applyGlifThemeControlledTransition",
+            "isDynamicColorEnabled",
+            "isEmbeddedActivityOnePaneEnabled",
+            "isFullDynamicColorEnabled",
+            "IsMaterialYouStyleEnabled",
+            "isNeutralButtonStyleEnabled",
+            "isSuwDayNightEnabled" -> bundle.putBoolean(method, true)
+
+            "getDeviceName" -> bundle.putCharSequence(method, getDeviceName())
+
+            "getOverlayConfig" -> fillOverlayConfig(bundle)
+        }
+        return bundle
+    }
+
+    private fun getDeviceName(): String {
+        var name = Settings.Global.getString(
+            requireContext().contentResolver,
+            Settings.Global.DEVICE_NAME
+        )
+        if (TextUtils.isEmpty(name)) {
+            name = Build.MODEL
+        }
+        return name
+    }
+
+    private fun fillOverlayConfig(bundle: Bundle) {
+        overlayConfigResources.forEach { resId ->
+            val context = requireContext()
+            val resName = context.resources.getResourceEntryName(resId)
+            val config = Bundle()
+            config.putString("packageName", context.packageName)
+            config.putString("resourceName", resName)
+            config.putInt("resourceId", resId)
+            bundle.putBundle(resName, config)
+        }
+    }
+}
diff --git a/src/com/android/settings/supervision/SupervisionDashboardScreen.kt b/src/com/android/settings/supervision/SupervisionDashboardScreen.kt
index e132bda825b..c2a4076b07c 100644
--- a/src/com/android/settings/supervision/SupervisionDashboardScreen.kt
+++ b/src/com/android/settings/supervision/SupervisionDashboardScreen.kt
@@ -87,8 +87,10 @@ open class SupervisionDashboardScreen : PreferenceScreenMixin, PreferenceLifecyc
     override val icon: Int
         get() = R.drawable.ic_account_child_invert
 
+    // TODO this screen is unavailable on GrapheneOS already, it's probably a bug that it's being
+    //  indexed and shown in search when `indexable` is `true`
     override val indexable
-        get() = true
+        get() = false
 
     override val keywords: Int
         get() = R.string.keywords_supervision_settings
diff --git a/src/com/android/settings/system/LogcatLinkPrefController.java b/src/com/android/settings/system/LogcatLinkPrefController.java
new file mode 100644
index 00000000000..e56f57dcd85
--- /dev/null
+++ b/src/com/android/settings/system/LogcatLinkPrefController.java
@@ -0,0 +1,34 @@
+package com.android.settings.system;
+
+import android.content.Context;
+import android.content.Intent;
+import android.ext.LogViewerApp;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.ext.ExtSettingControllerHelper;
+
+public class LogcatLinkPrefController extends BasePreferenceController {
+
+    public LogcatLinkPrefController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return ExtSettingControllerHelper.getGlobalSettingAvailability(mContext);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+
+        Intent i = LogViewerApp.getLogcatIntent();
+        mContext.startActivity(i);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 1d574b4357e..b7b76213642 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -27,9 +27,14 @@
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.development.linuxterminal.LinuxTerminalPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 // LINT.IfChange
 @SearchIndexable
 public class SystemDashboardFragment extends DashboardFragment {
@@ -47,6 +52,18 @@ public void onCreate(Bundle icicle) {
         }
     }
 
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        List<AbstractPreferenceController> result = super.createPreferenceControllers(context);
+        if (result == null) {
+            result = new ArrayList<>();
+        }
+        var linuxTerminal = new LinuxTerminalPreferenceController(context);
+        linuxTerminal.mIsInSystemSettings = true;
+        result.add(linuxTerminal);
+        return result;
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_SYSTEM_CATEGORY;
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index 38aef0f217b..7618f73e4b0 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -51,17 +51,7 @@ public void updateState(Preference preference) {
 
     @Override
     public int getAvailabilityStatus() {
-        if (mContext.getResources()
-                .getBoolean(
-                        com.android.internal.R.bool.config_userSwitchingMustGoThroughLoginScreen)) {
-            return UNSUPPORTED_ON_DEVICE;
-        } else if (!mUserCaps.isAdmin()) {
-            return DISABLED_FOR_USER;
-        } else if (mUserCaps.mDisallowAddUser && !mUserCaps.mDisallowAddUserSetByAdmin) {
-            return DISABLED_FOR_USER;
-        } else {
-            return AVAILABLE;
-        }
+        return UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/users/AppCopyFragment.java b/src/com/android/settings/users/AppCopyFragment.java
index 858de515ee9..f6cea8e8b48 100644
--- a/src/com/android/settings/users/AppCopyFragment.java
+++ b/src/com/android/settings/users/AppCopyFragment.java
@@ -200,6 +200,9 @@ private void populateApps() {
             if (app.packageName == null) continue;
 
             final AppSwitchPreference p = new AppSwitchPreference(getPrefContext());
+            if (AppCopyFragmentHelperExt.maybeSkipOrModifyAppSwitchPref(this, app, p)) {
+                continue;
+            }
             p.setIcon(app.icon != null ? app.icon.mutate() : null);
             p.setChecked(false);
             p.setTitle(app.appName);
diff --git a/src/com/android/settings/users/AppCopyFragmentHelperExt.java b/src/com/android/settings/users/AppCopyFragmentHelperExt.java
new file mode 100644
index 00000000000..14e8d43c66a
--- /dev/null
+++ b/src/com/android/settings/users/AppCopyFragmentHelperExt.java
@@ -0,0 +1,69 @@
+package com.android.settings.users;
+
+import android.annotation.UserIdInt;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.UserManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.users.AppCopyHelper;
+import com.android.settingslib.widget.AppSwitchPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AppCopyFragmentHelperExt {
+
+    public static final String EXTRA_FOR_PRIVATE_SPACE = "com.android.settings.users.extra.FOR_PRIVATE_SPACE";
+    public static final String EXTRA_SHOW_USER_APPS_ONLY = "com.android.settings.users.extra.SHOW_USER_APPS_ONLY";
+
+    static boolean maybeSkipOrModifyAppSwitchPref(
+            @NonNull AppCopyFragment appCopyFragment,
+            @NonNull AppCopyHelper.SelectableAppInfo selectableAppInfo,
+            @NonNull AppSwitchPreference appSwitchPreference) {
+        Bundle args = appCopyFragment.getArguments();
+        if (args == null) {
+            return false;
+        }
+
+        boolean forPrivateSpace = args.getBoolean(EXTRA_FOR_PRIVATE_SPACE, false);
+        boolean showUserAppsOnly = args.getBoolean(EXTRA_SHOW_USER_APPS_ONLY, false);
+
+        maybeModifyAppSwitchPref(appCopyFragment, selectableAppInfo, appSwitchPreference);
+        if (selectableAppInfo.ext.systemApp()) {
+            if (showUserAppsOnly) {
+                if (!forPrivateSpace || !selectableAppInfo.ext.neededForPrivateProfile()
+                        || !appCopyFragment.mUserManager.getUserInfo(
+                                appCopyFragment.mUser.getIdentifier()).isPrivateProfile()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static void maybeModifyAppSwitchPref(
+            @NonNull AppCopyFragment appCopyFragment,
+            @NonNull AppCopyHelper.SelectableAppInfo selectableAppInfo,
+            @NonNull AppSwitchPreference appSwitchPreference) {
+    }
+
+    public static Bundle appendArgs(
+            @Nullable Bundle bundle, @UserIdInt int userId,
+            boolean forPrivateSpace, boolean showUserAppsOnly) {
+        Bundle res = bundle != null ? bundle : new Bundle();
+        res.putInt(AppCopyFragment.EXTRA_USER_ID, userId);
+        res.putBoolean(EXTRA_FOR_PRIVATE_SPACE, forPrivateSpace);
+        res.putBoolean(EXTRA_SHOW_USER_APPS_ONLY, showUserAppsOnly);
+        return res;
+    }
+
+    private AppCopyFragmentHelperExt() {
+    }
+}
diff --git a/src/com/android/settings/users/SendCensoredNotificationsToCurrentUserPreferenceController.java b/src/com/android/settings/users/SendCensoredNotificationsToCurrentUserPreferenceController.java
new file mode 100644
index 00000000000..637d7bbb782
--- /dev/null
+++ b/src/com/android/settings/users/SendCensoredNotificationsToCurrentUserPreferenceController.java
@@ -0,0 +1,60 @@
+package com.android.settings.users;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.widget.Toast;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+public class SendCensoredNotificationsToCurrentUserPreferenceController
+        extends TogglePreferenceController {
+    private final UserCapabilities mUserCaps;
+
+    public SendCensoredNotificationsToCurrentUserPreferenceController(Context context, String key) {
+        super(context, key);
+        mUserCaps = UserCapabilities.create(context);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        mUserCaps.updateAddUserCapabilities(mContext);
+        if (!isAvailable()) {
+            preference.setVisible(false);
+        } else {
+            preference.setVisible(mUserCaps.mUserSwitcherEnabled);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SEND_CENSORED_NOTIFICATIONS_TO_CURRENT_USER, 0) != 0;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SEND_CENSORED_NOTIFICATIONS_TO_CURRENT_USER, isChecked ? 1 : 0);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return mContext.getString(
+                R.string.user_settings_send_censored_notifications_to_current_summary);
+    }
+
+    @Override
+    public int getSliceHighlightMenuRes() {
+        return R.string.menu_key_system;
+    }
+}
diff --git a/src/com/android/settings/users/UserAppsInstallSettings.java b/src/com/android/settings/users/UserAppsInstallSettings.java
new file mode 100644
index 00000000000..28a787f0385
--- /dev/null
+++ b/src/com/android/settings/users/UserAppsInstallSettings.java
@@ -0,0 +1,177 @@
+package com.android.settings.users;
+
+import static com.android.settings.users.UserDetailsSettings.EXTRA_USER_ID;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.utils.CandidateInfoExtra;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class UserAppsInstallSettings extends RadioButtonPickerFragment {
+
+    private static final String TAG = "UserAppsInstallSettings";
+    private static final String INSTALL_ENABLED = "install_apps_enabled";
+    private static final String INSTALL_FIRST_PARTY_ENABLED = "install_apps_first_party_enabled";
+    private static final String INSTALL_DISABLED = "install_apps_disabled";
+    private UserRestrictions userRestrictions;
+
+    static void launch(Preference preference, int userId) {
+
+        Bundle extras = preference.getExtras();
+        extras.putInt(EXTRA_USER_ID, userId);
+
+        new SubSettingLauncher(preference.getContext())
+                .setDestination(UserAppsInstallSettings.class.getName())
+                .setSourceMetricsCategory(extras.getInt(DashboardFragment.CATEGORY,
+                        SettingsEnums.PAGE_UNKNOWN))
+                .setTitleText(preference.getTitle())
+                .setArguments(extras)
+                .launch();
+    }
+
+    private static String getCurrentInstallRestriction(UserRestrictions userRestrictions) {
+        if (userRestrictions.isSet(UserManager.DISALLOW_INSTALL_APPS)) {
+            return INSTALL_DISABLED;
+        }
+
+        if (userRestrictions.isSet(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
+            return INSTALL_FIRST_PARTY_ENABLED;
+        }
+
+        return INSTALL_ENABLED;
+    }
+
+    static String getDescription(Context context, UserRestrictions userRestrictions) {
+        switch (getCurrentInstallRestriction(userRestrictions)) {
+            case INSTALL_ENABLED:
+                return context.getString(R.string.user_app_install_enabled);
+            case INSTALL_FIRST_PARTY_ENABLED:
+                return context.getString(R.string.user_app_install_enabled_first_party_sources);
+            case INSTALL_DISABLED:
+                return context.getString(R.string.user_app_install_disabled);
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Bundle args = requireArguments();
+        int userId = args.getInt(EXTRA_USER_ID, UserHandle.USER_NULL);
+        Context ctx = requireContext();
+        userRestrictions = UserRestrictions.createInstance(ctx, userId);
+        if (userRestrictions == null) {
+            Log.w(TAG, "Unable to fetch user info for provided userId");
+            finishFragment();
+            return;
+        }
+
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        PreferenceScreen ps = getPreferenceManager().createPreferenceScreen(requireContext());
+        setPreferenceScreen(ps);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return -1;
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        Context ctx = requireContext();
+        ArrayList<CandidateInfoExtra> candidates = new ArrayList<>(3);
+        if (!userRestrictions.userInfo.isGuest()) {
+            candidates.add(new CandidateInfoExtra(ctx.getString(R.string.user_app_install_enabled),
+                    ctx.getString(R.string.user_app_install_enabled_desc),
+                    INSTALL_ENABLED, true));
+        }
+        candidates.add(new CandidateInfoExtra(ctx.getString(R.string.user_app_install_enabled_first_party_sources),
+                        ctx.getString(R.string.user_app_install_enabled_first_party_sources_desc),
+                INSTALL_FIRST_PARTY_ENABLED, true));
+        candidates.add(new CandidateInfoExtra(ctx.getString(R.string.user_app_install_disabled),
+                        ctx.getString(R.string.user_app_install_disabled_desc),
+                INSTALL_DISABLED, true));
+        return candidates;
+    }
+
+    @Override
+    public void bindPreferenceExtra(SelectorWithWidgetPreference pref, String key, CandidateInfo info,
+                                    String defaultKey, String systemDefaultKey) {
+        pref.setSingleLineTitle(false);
+
+        if (info instanceof CandidateInfoExtra) {
+            var cie = (CandidateInfoExtra) info;
+            pref.setSummary(cie.loadSummary());
+        }
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return getCurrentInstallRestriction(userRestrictions);
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        if (key == null) {
+            return false;
+        }
+
+        switch (key) {
+            case INSTALL_ENABLED:
+                if (userRestrictions.userInfo.isGuest()) {
+                    return false;
+                }
+                userRestrictions.set(UserManager.DISALLOW_INSTALL_APPS, false);
+                userRestrictions.set(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, false);
+                return true;
+            case INSTALL_FIRST_PARTY_ENABLED:
+                userRestrictions.set(UserManager.DISALLOW_INSTALL_APPS, false);
+                if (!userRestrictions.userInfo.isGuest()) {
+                    userRestrictions.set(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
+                }
+                return true;
+            case INSTALL_DISABLED:
+                userRestrictions.set(UserManager.DISALLOW_INSTALL_APPS, true);
+                if (!userRestrictions.userInfo.isGuest()) {
+                    userRestrictions.set(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return METRICS_CATEGORY_UNKNOWN;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateCandidates();
+    }
+}
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 14fb6f353d0..c3484111183 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -43,6 +43,7 @@
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
+import androidx.preference.SwitchPreferenceCompat;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
@@ -79,6 +80,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
     private static final String KEY_APP_AND_CONTENT_ACCESS = "app_and_content_access";
     private static final String KEY_APP_COPYING = "app_copying";
 
+    private static final String KEY_APP_INSTALLS = "app_installs";
+    private static final String KEY_RUN_IN_BACKGROUND = "allow_run_in_background";
+
     /** Integer extra containing the userId to manage */
     static final String EXTRA_USER_ID = "user_id";
 
@@ -91,7 +95,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
     private static final int DIALOG_CONFIRM_GRANT_ADMIN = 7;
 
     /** Whether to enable the app_copying fragment. */
-    private static final boolean SHOW_APP_COPYING_PREF = false;
+    private static final boolean SHOW_APP_COPYING_PREF = true;
     private static final int MESSAGE_PADDING = 20;
     @VisibleForTesting
     static final int REQUEST_CONFIRM_REMOVE = 1;
@@ -114,10 +118,13 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
     Preference mRemoveUserPref;
     @VisibleForTesting
     TwoStatePreference mGrantAdminPref;
+    Preference mAppsInstallsPref;
+    private SwitchPreferenceCompat mRunInBackgroundPref;
 
     @VisibleForTesting
     /** The user being studied (not the user doing the studying). */
     UserInfo mUserInfo;
+    private UserRestrictions userRestrictions;
 
     @Override
     public int getMetricsCategory() {
@@ -149,6 +156,9 @@ public void onResume() {
         if (mUserInfo.isGuest() && mGuestUserAutoCreated) {
             mRemoveUserPref.setEnabled((mUserInfo.flags & UserInfo.FLAG_INITIALIZED) != 0);
         }
+        mAppsInstallsPref.setSummary(UserAppsInstallSettings.getDescription(
+                requireContext(), userRestrictions));
+        mAppCopyingPref.setEnabled(!userRestrictions.isSet(UserManager.DISALLOW_INSTALL_APPS));
     }
 
     @Override
@@ -189,6 +199,9 @@ public boolean onPreferenceClick(Preference preference) {
         } else if (preference == mAppCopyingPref) {
             openAppCopyingScreen();
             return true;
+        } else if (preference == mAppsInstallsPref) {
+            UserAppsInstallSettings.launch(preference, mUserInfo.id);
+            return true;
         }
         return false;
     }
@@ -216,7 +229,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 showDialog(DIALOG_CONFIRM_GRANT_ADMIN);
             }
             return false;
+        } else if (preference == mRunInBackgroundPref) {
+            userRestrictions.set(UserManager.DISALLOW_RUN_IN_BACKGROUND, !((boolean) newValue));
+            return true;
         }
+
         return true;
     }
 
@@ -365,6 +382,7 @@ void initialize(Context context, Bundle arguments) {
         boolean isNewUser =
                 arguments.getBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, false);
         mUserInfo = mUserManager.getUserInfo(userId);
+        userRestrictions = UserRestrictions.createInstance(mUserManager, mUserInfo);
 
         mSwitchUserPref = findPreference(KEY_SWITCH_USER);
         mPhonePref = findPreference(KEY_ENABLE_TELEPHONY_CALLING);
@@ -374,6 +392,8 @@ void initialize(Context context, Bundle arguments) {
         mGrantAdminPref = findPreference(KEY_GRANT_ADMIN);
 
         mGrantAdminPref.setChecked(mUserInfo.isAdmin());
+        mAppsInstallsPref = findPreference(KEY_APP_INSTALLS);
+        mRunInBackgroundPref = findPreference(KEY_RUN_IN_BACKGROUND);
 
         mSwitchUserPref.setVisible(mUserCaps.mUserSwitchingUiEnabled
                 && UserHandle.myUserId() != mUserInfo.id);
@@ -430,6 +450,8 @@ void initialize(Context context, Bundle arguments) {
             removePreference(KEY_ENABLE_TELEPHONY_CALLING);
             removePreference(KEY_APP_AND_CONTENT_ACCESS);
             removePreference(KEY_APP_COPYING);
+            removePreference(KEY_APP_INSTALLS);
+            removePreference(KEY_RUN_IN_BACKGROUND);
         } else {
             if (!Utils.isVoiceCapable(context)) { // no telephony
                 removePreference(KEY_ENABLE_TELEPHONY_CALLING);
@@ -453,10 +475,12 @@ void initialize(Context context, Bundle arguments) {
                 if (!SHOW_APP_COPYING_PREF) {
                     removePreference(KEY_APP_COPYING);
                 }
+                removePreference(KEY_RUN_IN_BACKGROUND);
             } else {
                 mPhonePref.setChecked(!mUserManager.hasUserRestriction(
                         UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
-                removePreference(KEY_APP_COPYING);
+                mRunInBackgroundPref.setChecked(!userRestrictions.isSet(
+                        UserManager.DISALLOW_RUN_IN_BACKGROUND));
             }
 
             // Remove preference KEY_REMOVE_USER if DISALLOW_REMOVE_USER restriction is set
@@ -465,10 +489,12 @@ void initialize(Context context, Bundle arguments) {
                 removePreference(KEY_REMOVE_USER);
             }
 
+            mAppsInstallsPref.setOnPreferenceClickListener(this);
             mPhonePref.setOnPreferenceChangeListener(this);
             mGrantAdminPref.setOnPreferenceChangeListener(this);
             mAppAndContentAccessPref.setOnPreferenceClickListener(this);
             mAppCopyingPref.setOnPreferenceClickListener(this);
+            mRunInBackgroundPref.setOnPreferenceChangeListener(this);
         }
     }
 
diff --git a/src/com/android/settings/users/UserRestrictions.java b/src/com/android/settings/users/UserRestrictions.java
new file mode 100644
index 00000000000..6ab1b301118
--- /dev/null
+++ b/src/com/android/settings/users/UserRestrictions.java
@@ -0,0 +1,66 @@
+package com.android.settings.users;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.UserManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public final class UserRestrictions {
+
+    @NonNull
+    private final UserManager userManager;
+    @NonNull
+    public final UserInfo userInfo;
+
+    @Nullable
+    public static UserRestrictions createInstance(@NonNull Context ctx, int userId) {
+        UserManager userManager = ctx.getSystemService(UserManager.class);
+        if (userManager == null) {
+            return null;
+        }
+
+        return createInstance(userManager, userId);
+    }
+
+    @Nullable
+    public static UserRestrictions createInstance(@NonNull UserManager userManager, int userId) {
+        UserInfo userInfo = userManager.getUserInfo(userId);
+        if (userInfo == null) {
+            return null;
+        }
+
+        return new UserRestrictions(userManager, userInfo);
+    }
+
+    @NonNull
+    public static UserRestrictions createInstance(@NonNull UserManager userManager, @NonNull UserInfo userInfo) {
+        return new UserRestrictions(userManager, userInfo);
+    }
+
+    private UserRestrictions(@NonNull UserManager userManager, @NonNull UserInfo userInfo) {
+        this.userManager = userManager;
+        this.userInfo = userInfo;
+    }
+
+    public boolean isSet(String restrictionKey) {
+        final boolean isSetFromUser = userManager.hasUserRestriction(restrictionKey, userInfo.getUserHandle());
+        if (userInfo.isGuest()) {
+            return isSetFromUser || userManager.getDefaultGuestRestrictions().getBoolean(restrictionKey);
+        }
+
+        return isSetFromUser;
+    }
+
+    public void set(String restrictionKey, boolean enableRestriction) {
+        if (userInfo.isGuest()) {
+            Bundle defaultGuestRestrictions = userManager.getDefaultGuestRestrictions();
+            defaultGuestRestrictions.putBoolean(restrictionKey, enableRestriction);
+            userManager.setDefaultGuestRestrictions(defaultGuestRestrictions);
+        } else {
+            userManager.setUserRestriction(restrictionKey, enableRestriction, userInfo.getUserHandle());
+        }
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index d1186a52244..07053db27f2 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -149,6 +149,8 @@ public class UserSettings extends SettingsPreferenceFragment
     private static final String KEY_GUEST_USER_CATEGORY = "guest_user_category";
     private static final String KEY_ALLOW_MULTIPLE_USERS = "allow_multiple_users";
     private static final String KEY_USER_SETTINGS_SCREEN = "user_settings_screen";
+    private static final String KEY_SEND_CENSORED_NOTIFICATIONS =
+            "user_settings_send_censored_notifications_to_current";
     private static final String KEY_USER_SWITCH_TOGGLE = "multiple_users_main_switch";
 
     private static final String SETTING_GUEST_HAS_LOGGED_IN = "systemui.guest_has_logged_in";
@@ -249,6 +251,7 @@ public class UserSettings extends SettingsPreferenceFragment
     private AddUserFromSignInPreferenceController mAddUserFromSignInPreferenceController;
     private GuestTelephonyPreferenceController mGuestTelephonyPreferenceController;
     private RemoveGuestOnExitPreferenceController mRemoveGuestOnExitPreferenceController;
+    private SendCensoredNotificationsToCurrentUserPreferenceController mSendCensoredNotificationsToCurrentUserPreferenceController;
     private MultiUserTopIntroPreferenceController mMultiUserTopIntroPreferenceController;
     private TimeoutToDockUserPreferenceController mTimeoutToDockUserPreferenceController;
     private UserCreatingDialog mUserCreatingDialog;
@@ -341,6 +344,10 @@ public void onCreate(Bundle icicle) {
         mRemoveGuestOnExitPreferenceController = new RemoveGuestOnExitPreferenceController(
                 activity, KEY_REMOVE_GUEST_ON_EXIT, this, mHandler);
 
+        mSendCensoredNotificationsToCurrentUserPreferenceController =
+                new SendCensoredNotificationsToCurrentUserPreferenceController(activity,
+                        KEY_SEND_CENSORED_NOTIFICATIONS);
+
         mMultiUserTopIntroPreferenceController = new MultiUserTopIntroPreferenceController(activity,
                 KEY_MULTIUSER_TOP_INTRO);
 
@@ -355,6 +362,7 @@ public void onCreate(Bundle icicle) {
         mAddUserFromSignInPreferenceController.displayPreference(screen);
         mGuestTelephonyPreferenceController.displayPreference(screen);
         mRemoveGuestOnExitPreferenceController.displayPreference(screen);
+        mSendCensoredNotificationsToCurrentUserPreferenceController.displayPreference(screen);
         mMultiUserTopIntroPreferenceController.displayPreference(screen);
         mTimeoutToDockUserPreferenceController.displayPreference(screen);
         mMainSwitchController.displayPreference(screen);
@@ -362,6 +370,8 @@ public void onCreate(Bundle icicle) {
 
         screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
                 .setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
+        screen.findPreference(mSendCensoredNotificationsToCurrentUserPreferenceController.getPreferenceKey())
+                .setOnPreferenceChangeListener(mSendCensoredNotificationsToCurrentUserPreferenceController);
 
         screen.findPreference(mAddUserFromSignInPreferenceController.getPreferenceKey())
                 .setOnPreferenceChangeListener(mAddUserFromSignInPreferenceController);
@@ -453,6 +463,9 @@ public void onResume() {
         mRemoveGuestOnExitPreferenceController.updateState(screen.findPreference(
                 mRemoveGuestOnExitPreferenceController.getPreferenceKey()));
         mMainSwitchController.updateState();
+        mSendCensoredNotificationsToCurrentUserPreferenceController.updateState(screen.findPreference(
+                mSendCensoredNotificationsToCurrentUserPreferenceController.getPreferenceKey()));
+
         if (mShouldUpdateUserList) {
             updateUI();
         }
@@ -1425,6 +1438,10 @@ && getPrefContext()
                 mGuestTelephonyPreferenceController.getPreferenceKey());
         mGuestTelephonyPreferenceController.updateState(guestCallPreference);
 
+        final Preference sendCensoredNotifs = getPreferenceScreen().findPreference(
+                mSendCensoredNotificationsToCurrentUserPreferenceController.getPreferenceKey());
+        mSendCensoredNotificationsToCurrentUserPreferenceController.updateState(sendCensoredNotifs);
+
         final Preference multiUserTopIntroPreference = getPreferenceScreen().findPreference(
                 mMultiUserTopIntroPreferenceController.getPreferenceKey());
         mMultiUserTopIntroPreferenceController.updateState(multiUserTopIntroPreference);
@@ -1995,6 +2012,8 @@ public List<String> getNonIndexableKeysFromXml(Context context, int xmlResId,
                             new AddUserWhenLockedPreferenceController(
                                     context, KEY_ADD_USER_WHEN_LOCKED);
                     controller.updateNonIndexableKeys(niks);
+                    new SendCensoredNotificationsToCurrentUserPreferenceController(context,
+                            KEY_SEND_CENSORED_NOTIFICATIONS).updateNonIndexableKeys(niks);
                     new AutoSyncDataPreferenceController(context, null /* parent */)
                             .updateNonIndexableKeys(niks);
                     new AutoSyncPersonalDataPreferenceController(context, null /* parent */)
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 9578efbb55d..4927e221609 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -62,8 +62,7 @@ public abstract class RadioButtonPickerFragment extends SettingsPreferenceFragme
         SelectorWithWidgetPreference.OnClickListener {
 
     @VisibleForTesting
-    static final String EXTRA_FOR_WORK = "for_work";
-
+    protected static final String EXTRA_FOR_WORK = "for_work";
     private static final String TAG = "RadioButtonPckrFrgmt";
     private static final String KEY_CATEGORY_PREFERENCE = "radio_button_picker_category";
     @VisibleForTesting
@@ -182,6 +181,12 @@ protected SelectorWithWidgetPreference createPreference() {
         return new RestrictedSelectorWithWidgetPreference(getPrefContext());
     }
 
+    protected void addPrefsBeforeList(PreferenceScreen screen) {
+        if (!mAppendStaticPreferences) {
+            addStaticPreferences(screen);
+        }
+    }
+
     public void updateCandidates() {
         mCandidates.clear();
         final List<? extends CandidateInfo> candidateList = getCandidates();
@@ -197,9 +202,7 @@ public void updateCandidates() {
         if (mIllustrationId != 0) {
             addIllustration(screen);
         }
-        if (!mAppendStaticPreferences) {
-            addStaticPreferences(screen);
-        }
+        addPrefsBeforeList(screen);
         PreferenceGroup radioButtonsGroup = screen;
         if (mCategoryTitleId != 0) {
             Context context = getPrefContext();
@@ -235,6 +238,10 @@ public void updateCandidates() {
             }
         }
         mayCheckOnlyRadioButton();
+        addPrefsAfterList(screen);
+    }
+
+    protected void addPrefsAfterList(PreferenceScreen screen) {
         if (mAppendStaticPreferences) {
             addStaticPreferences(screen);
         }
diff --git a/src/com/android/settings/wifi/WifiAutoOffPrefController.java b/src/com/android/settings/wifi/WifiAutoOffPrefController.java
new file mode 100644
index 00000000000..b8ec16bd69a
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiAutoOffPrefController.java
@@ -0,0 +1,39 @@
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.ext.settings.ExtSettings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.ext.AutoOffSetting;
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.ext.RadioButtonPickerFragment2;
+
+public class WifiAutoOffPrefController extends IntSettingPrefController {
+
+    public WifiAutoOffPrefController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.WIFI_AUTO_OFF);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        int r = super.getAvailabilityStatus();
+        if (r == AVAILABLE) {
+            return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI) ?
+                    AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        }
+        return r;
+    }
+
+    @Override
+    public void addPrefsBeforeList(RadioButtonPickerFragment2 fragment, PreferenceScreen screen) {
+        addFooterPreference(screen, R.string.wifi_auto_off_footer);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        AutoOffSetting.getEntries(entries);
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 5abd64d0005..098b4b37bc3 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -70,6 +70,7 @@
 import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.widget.EnhancedSettingsSpinnerAdapter;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController;
+import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settings.wifi.utils.TextInputGroup;
 import com.android.settings.wifi.utils.TextInputValidator;
@@ -151,8 +152,9 @@ public class WifiConfigController implements TextWatcher,
     };
 
     // Should be the same index value as wifi_privacy_entries in arrays.xml
-    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC = 0;
-    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_DEVICE_MAC = 1;
+    public static final int PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC = 0;
+    public static final int PRIVACY_PREF_INDEX_PER_NETWORK_RANDOMIZED_MAC = 1;
+    public static final int PRIVACY_PREF_INDEX_DEVICE_MAC = 2;
 
     // Should be the same index value as wifi_dhcp_entries in arrays.xml
     @VisibleForTesting static final int DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_ENABLE = 0;
@@ -311,7 +313,7 @@ private void initWifiConfigController(AccessPoint accessPoint, int mode) {
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         mHiddenSettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_hidden_entries));
         mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
-        mPrivacySettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_privacy_entries));
+        mPrivacySettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_privacy_entries_ext));
         mDhcpSettingsSpinner = mView.findViewById(R.id.dhcp_settings);
         mDhcpSettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_dhcp_entries));
         if (mWifiManager.isConnectedMacRandomizationSupported()) {
@@ -342,9 +344,9 @@ private void initWifiConfigController(AccessPoint accessPoint, int mode) {
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
 
-                mPrivacySettingsSpinner.setSelection(
-                        config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT
-                        ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
+                int selection = WifiPrivacyPreferenceController2
+                        .translateWifiEntryPrivacyToPrefValue(config.macRandomizationSetting);
+                mPrivacySettingsSpinner.setSelection(selection);
 
                 mDhcpSettingsSpinner.setSelection(
                         config.isSendDhcpHostnameEnabled()
@@ -813,10 +815,8 @@ public WifiConfiguration getConfig() {
         }
 
         if (mPrivacySettingsSpinner != null) {
-            config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition()
-                    == PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC
-                    ? WifiConfiguration.RANDOMIZATION_PERSISTENT
-                    : WifiConfiguration.RANDOMIZATION_NONE;
+            config.macRandomizationSetting = WifiPrivacyPreferenceController2
+                    .translatePrefValueToWifiConfigSetting(mPrivacySettingsSpinner.getSelectedItemPosition());
         }
 
         if (mDhcpSettingsSpinner != null) {
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 4e0ac008a0f..a77289ff2dc 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -337,10 +337,17 @@ private void initWifiConfigController2(WifiEntry wifiEntry) {
         mHiddenSettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_hidden_entries));
         if (!mHideMeteredAndPrivacy && mWifiManager.isConnectedMacRandomizationSupported()) {
             mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
-            mPrivacySettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_privacy_entries));
+            mPrivacySettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_privacy_entries_ext));
             if (Flags.androidVWifiApi()) {
                 mDhcpSettingsSpinner = mView.findViewById(R.id.dhcp_settings);
                 mDhcpSettingsSpinner.setAdapter(getSpinnerAdapter(R.array.wifi_dhcp_entries));
+                {
+                    int selection = 1;
+                    if (WifiPrivacyPreferenceController.Companion.translatePrefValueToSendDhcpHostnameEnabled(selection)) {
+                        throw new IllegalStateException("unexpected order of DHCP hostname setting entries");
+                    }
+                    mDhcpSettingsSpinner.setSelection(selection);
+                }
             }
             mView.findViewById(R.id.privacy_settings_fields).setVisibility(View.VISIBLE);
         }
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 593ab0154ae..820e23b6b27 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -724,7 +724,7 @@ private void refreshWifiType() {
     }
 
     private int getMacAddressTitle() {
-        if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
+        if (mWifiEntry.getPrivacy() != WifiEntry.PRIVACY_DEVICE_MAC) {
             return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED
                     ? R.string.wifi_advanced_randomized_mac_address_title
                     : R.string.wifi_advanced_randomized_mac_address_disconnected_title;
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
index 94a1168dbb7..ca323f94ab8 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
@@ -90,8 +90,8 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {
     ) {
         Column {
             val title = stringResource(id = R.string.wifi_privacy_mac_settings)
-            val wifiPrivacyEntries = stringArrayResource(R.array.wifi_privacy_entries)
-            val wifiPrivacyValues = stringArrayResource(R.array.wifi_privacy_values)
+            val wifiPrivacyEntries = stringArrayResource(R.array.wifi_privacy_entries_ext)
+            val wifiPrivacyValues = stringArrayResource(R.array.wifi_privacy_values_ext)
             val textsSelectedId = rememberSaveable { mutableIntStateOf(wifiEntry.privacy) }
             val dataList = remember {
                 wifiPrivacyEntries.mapIndexed { index, text ->
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index bd1b4caebd1..ce89af0793f 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
@@ -31,6 +32,10 @@
 import com.android.wifi.flags.Flags;
 import com.android.wifitrackerlib.WifiEntry;
 
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_PREF_INDEX_DEVICE_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_PREF_INDEX_PER_NETWORK_RANDOMIZED_MAC;
+
 /**
  * A controller that controls whether the Wi-Fi network is mac randomized or not.
  */
@@ -97,9 +102,6 @@ int getRandomizationValue() {
         return mWifiEntry.getPrivacy();
     }
 
-    private static final int PREF_RANDOMIZATION_PERSISTENT = 0;
-    private static final int PREF_RANDOMIZATION_NONE = 1;
-
     /**
      * Translates a WifiEntry.Privacy value to the matching preference index value.
      *
@@ -107,8 +109,13 @@ int getRandomizationValue() {
      * @return index value of preference
      */
     public static int translateWifiEntryPrivacyToPrefValue(@WifiEntry.Privacy int privacy) {
-        return (privacy == WifiEntry.PRIVACY_RANDOMIZED_MAC)
-            ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE;
+        Log.d("WifiMacRnd", "translateMacRandomizedValueToPrefValue called from", new Throwable());
+        return switch (privacy) {
+            case WifiEntry.PRIVACY_RANDOMIZATION_ALWAYS -> PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC;
+            case WifiEntry.PRIVACY_RANDOMIZED_MAC -> PRIVACY_PREF_INDEX_PER_NETWORK_RANDOMIZED_MAC;
+            case WifiEntry.PRIVACY_DEVICE_MAC -> PRIVACY_PREF_INDEX_DEVICE_MAC;
+            default -> PRIVACY_PREF_INDEX_DEVICE_MAC;
+        };
     }
 
     /**
@@ -118,8 +125,13 @@ public static int translateWifiEntryPrivacyToPrefValue(@WifiEntry.Privacy int pr
      * @return WifiConfiguration.MacRandomizationSetting value
      */
     public static int translatePrefValueToWifiConfigSetting(int prefMacRandomized) {
-        return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT)
-            ? WifiConfiguration.RANDOMIZATION_AUTO : WifiConfiguration.RANDOMIZATION_NONE;
+        Log.d("WifiMacRnd", "translatePrefValueToWifiConfigSetting called from", new Throwable());
+        return switch (prefMacRandomized) {
+            case PRIVACY_PREF_INDEX_DEVICE_MAC -> WifiConfiguration.RANDOMIZATION_NONE;
+            case PRIVACY_PREF_INDEX_PER_NETWORK_RANDOMIZED_MAC -> WifiConfiguration.RANDOMIZATION_PERSISTENT;
+            case PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC -> WifiConfiguration.RANDOMIZATION_ALWAYS;
+            default -> WifiConfiguration.RANDOMIZATION_ALWAYS;
+        };
     }
 
     private void updateSummary(ListPreference preference, int macRandomized) {
diff --git a/src/com/google/android/settings/display/HighEmissionFrequencyController.kt b/src/com/google/android/settings/display/HighEmissionFrequencyController.kt
new file mode 100644
index 00000000000..6b327bd5646
--- /dev/null
+++ b/src/com/google/android/settings/display/HighEmissionFrequencyController.kt
@@ -0,0 +1,46 @@
+package com.google.android.settings.display
+
+import android.content.Context
+import android.os.Build
+import android.os.UserHandle
+import android.provider.Settings
+import com.android.settings.R
+import com.android.settings.core.TogglePreferenceController
+
+class HighEmissionFrequencyController(context: Context, prefKey: String) :
+    TogglePreferenceController(context, prefKey) {
+    override fun getAvailabilityStatus(): Int {
+        // SettingsGoogle and PixelDisplayService both seem to assume that the array might not exist
+        // and perform a dynamic lookup. However, this array actually exists in AOSP and there's no
+        // reason we can't just use the static identifier.
+        val options = mContext.resources.getIntArray(com.android.internal.R.array.config_availableEMValueOptions)
+
+        // This matches PixelDisplayService's check. Note that SettingsGoogle has a different
+        // conditional, which checks if the array is exactly [0, 1].
+        return if ("Google".equals(Build.MANUFACTURER) && options.size >= 2) {
+            AVAILABLE
+        } else {
+            UNSUPPORTED_ON_DEVICE
+        }
+    }
+
+    override fun isChecked(): Boolean {
+        return Settings.Secure.getIntForUser(
+            mContext.contentResolver,
+            Settings.Secure.EM_VALUE,
+            0,
+            UserHandle.USER_CURRENT,
+        ) == 1
+    }
+
+    override fun setChecked(isChecked: Boolean): Boolean {
+        return Settings.Secure.putIntForUser(
+            mContext.contentResolver,
+            Settings.Secure.EM_VALUE,
+            (if (isChecked) 1 else 0),
+            UserHandle.USER_CURRENT,
+        )
+    }
+
+    override fun getSliceHighlightMenuRes(): Int = R.string.menu_key_display
+}
diff --git a/src/com/google/android/settings/fuelgauge/BatterySettingsFeatureProviderGoogleImpl.java b/src/com/google/android/settings/fuelgauge/BatterySettingsFeatureProviderGoogleImpl.java
new file mode 100644
index 00000000000..bd92fdeb0ca
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/BatterySettingsFeatureProviderGoogleImpl.java
@@ -0,0 +1,77 @@
+package com.google.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.ext.power.BatteryChargeLimit;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.BatterySettingsFeatureProviderImpl;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settingslib.utils.PowerUtil;
+
+import com.google.android.settings.fuelgauge.batterytip.BatteryReplacementDetector;
+
+import java.util.List;
+
+// based on code from SettingsGoogle app
+public class BatterySettingsFeatureProviderGoogleImpl extends BatterySettingsFeatureProviderImpl {
+
+    @Override
+    public boolean isChargingOptimizationMode(@NonNull Context context, boolean isLongLife) {
+        return isLongLife && BatteryChargeLimit.isChargeLimitEnabled(context);
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getChargingOptimizationRemainingLabel(
+            @NonNull Context context,
+            int batteryLevel,
+            int pluggedStatus,
+            long chargeRemainingTimeMs,
+            long currentTimeMs) {
+        if (batteryLevel >= BatteryChargeLimit.CHARGE_LEVEL) {
+            return context.getString(R.string.charging_optimization_reach_limit_remaining_time_label);
+        }
+        if (chargeRemainingTimeMs <= 0) {
+            return null;
+        }
+        String targetTime = PowerUtil.getTargetTimeShortString(context,
+                chargeRemainingTimeMs, currentTimeMs);
+
+        return context.getString(R.string.charging_optimization_remaining_time_label, targetTime);
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getChargingOptimizationChargeLabel(
+            @NonNull Context context,
+            int batteryLevel,
+            String batteryPercentageString,
+            long chargeRemainingTimeMs,
+            long currentTimeMs) {
+        if (batteryLevel >= BatteryChargeLimit.CHARGE_LEVEL) {
+            return context.getString(R.string.charging_optimization_reach_limit_charge_label,
+                    batteryPercentageString);
+        }
+        if (chargeRemainingTimeMs > 0) {
+            String targetTime = PowerUtil.getTargetTimeShortString(context,
+                    chargeRemainingTimeMs, currentTimeMs);
+            return context.getString(R.string.charging_optimization_charge_label,
+                    batteryPercentageString, targetTime);
+        }
+        return null;
+    }
+
+    @Override
+    public void addBatteryTipDetector(Context context, List<BatteryTip> batteryTips,
+            BatteryInfo batteryInfo, BatteryTipPolicy batteryTipPolicy) {
+        super.addBatteryTipDetector(context, batteryTips, batteryInfo, batteryTipPolicy);
+        if (Utils.isBarrelRequiredDevice(context)) {
+            batteryTips.addFirst(new BatteryReplacementDetector(context).detect());
+        }
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/GoogleBattery.java b/src/com/google/android/settings/fuelgauge/GoogleBattery.java
new file mode 100644
index 00000000000..2608297a5c8
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/GoogleBattery.java
@@ -0,0 +1,23 @@
+package com.google.android.settings.fuelgauge;
+
+import android.annotation.Nullable;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.util.Log;
+
+import vendor.google.google_battery.IGoogleBattery;
+
+public class GoogleBattery {
+    static final String TAG = "GoogleBattery";
+
+    @Nullable
+    public static IGoogleBattery getService() {
+        String svc = IGoogleBattery.DESCRIPTOR + "/default";
+        IBinder binder = ServiceManager.getService(svc);
+        if (binder == null) {
+            Log.w(TAG, svc + " is null");
+            return null;
+        }
+        return IGoogleBattery.Stub.asInterface(binder);
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java b/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java
new file mode 100644
index 00000000000..d8d974905b2
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/PowerUsageFeatureProviderGoogleImpl.java
@@ -0,0 +1,53 @@
+package com.google.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
+
+import vendor.google.google_battery.IGoogleBattery;
+
+// based on code from SettingsGoogle app
+public class PowerUsageFeatureProviderGoogleImpl extends PowerUsageFeatureProviderImpl {
+    private static final String TAG = "PowerUsageFeatureProviderGoogleImpl";
+
+    public PowerUsageFeatureProviderGoogleImpl(Context context) {
+        super(context);
+    }
+
+    private static final String DWELL_DEFEND_TRIGGER_KEY = "ACTIVE";
+    private static final String TEMP_DEFEND_TRIGGER_KEY = " t=1";
+
+    @Override
+    public boolean isBatteryDefend(BatteryInfo info) {
+        IGoogleBattery googleBattery = GoogleBattery.getService();
+        if (googleBattery == null) {
+            return false;
+        }
+
+        try {
+            String dwellStatus = fetchFeatureStatus(googleBattery, 3);
+            String tempStatus = fetchFeatureStatus(googleBattery, 1);
+            Log.d(TAG, "dwell status: " + dwellStatus + ", temp status: " + tempStatus);
+            boolean isDwellDefend = DWELL_DEFEND_TRIGGER_KEY.equals(dwellStatus);
+            boolean isTempDefend = tempStatus != null && tempStatus.contains(TEMP_DEFEND_TRIGGER_KEY);
+            return isDwellDefend || isTempDefend;
+        } catch (Exception e) {
+            Log.e(TAG, "", e);
+            return false;
+        }
+    }
+
+    private static final int GOOGLE_BATTERY_PROPERTY_STATE = 18;
+
+    private static String fetchFeatureStatus(IGoogleBattery googleBattery, int feature) {
+        try {
+            return googleBattery.getStringProperty(feature, GOOGLE_BATTERY_PROPERTY_STATE);
+        } catch (RemoteException e) {
+            throw e.rethrowAsRuntimeException();
+        }
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/Utils.java b/src/com/google/android/settings/fuelgauge/Utils.java
new file mode 100644
index 00000000000..aaaf12b648f
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/Utils.java
@@ -0,0 +1,12 @@
+package com.google.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.os.Build;
+import android.text.TextUtils;
+
+public class Utils {
+    public static boolean isBarrelRequiredDevice(Context context) {
+        // Removed a check for Settings.Secure.getInt(context.getContentResolver(), "barrel_forcibly_disabled", 0) == 1;
+        return TextUtils.equals("bluejay", Build.DEVICE); // && !isBarrelForciblyDisabled;
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementDetector.java b/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementDetector.java
new file mode 100644
index 00000000000..1fdcfa2584c
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementDetector.java
@@ -0,0 +1,43 @@
+package com.google.android.settings.fuelgauge.batterytip;
+
+import static com.google.android.settings.fuelgauge.batterytip.CycleCountTipPreferenceController.BATTERY_HEALTH_FAIR;
+import static com.google.android.settings.fuelgauge.batterytip.CycleCountTipPreferenceController.CYCLE_COUNT_THRESHOLD;
+import static com.google.android.settings.fuelgauge.batterytip.CycleCountTipPreferenceController.CYCLE_COUNT_UNAVAILABLE;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.util.Log;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+
+public class BatteryReplacementDetector {
+    private final Context mContext;
+    private final static String TAG = BatteryReplacementDetector.class.getSimpleName();
+
+    public BatteryReplacementDetector(Context context) {
+        this.mContext = context;
+    }
+
+    public BatteryTip detect() {
+        final Intent batteryIntent = BatteryUtils.getBatteryIntent(mContext);
+        if (batteryIntent == null) {
+            return new BatteryReplacementTip(BatteryTip.StateType.INVISIBLE,
+                    BatteryManager.BATTERY_HEALTH_UNKNOWN);
+        }
+        int health = batteryIntent.getIntExtra(BatteryManager.EXTRA_HEALTH,
+                BatteryManager.BATTERY_HEALTH_UNKNOWN);
+        int cycleCount = batteryIntent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT,
+                CYCLE_COUNT_UNAVAILABLE);
+        Log.d(TAG, "detect() - battery health: " + health + ", cycle count: " + cycleCount);
+
+        final @BatteryTip.StateType int state;
+        if (health == BatteryManager.BATTERY_HEALTH_DEAD ||
+                (health == BATTERY_HEALTH_FAIR && cycleCount >= CYCLE_COUNT_THRESHOLD)) {
+            state = BatteryTip.StateType.NEW;
+        } else {
+            state = BatteryTip.StateType.INVISIBLE;
+        }
+        return new BatteryReplacementTip(state, health);
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementTip.kt b/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementTip.kt
new file mode 100644
index 00000000000..b39d4513993
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/batterytip/BatteryReplacementTip.kt
@@ -0,0 +1,96 @@
+package com.google.android.settings.fuelgauge.batterytip
+
+import android.app.settings.SettingsEnums
+import android.content.Context
+import android.os.BatteryManager
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.Html
+import android.util.Log
+import androidx.preference.Preference
+import com.android.settings.R
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip
+import com.android.settingslib.HelpUtils
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider
+import com.android.settingslib.widget.BannerMessagePreference
+
+private const val TAG = "BatteryReplacementTip"
+
+class BatteryReplacementTip : BatteryTip {
+    private var mBatteryHealth = 0
+
+    constructor(@StateType state: Int, batteryHealth: Int) : super(
+        TipType.BATTERY_HEALTH,
+        state,
+        false
+    ) {
+        mBatteryHealth = batteryHealth
+    }
+
+    constructor(parcel: Parcel) : super(parcel) {
+        mBatteryHealth = parcel.readInt()
+    }
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        super.writeToParcel(dest, flags)
+        dest.writeInt(mBatteryHealth)
+    }
+
+    override fun getTitle(context: Context): CharSequence {
+        return context.getString(R.string.battery_tip_replacement_title)
+    }
+
+    override fun getSummary(context: Context): CharSequence {
+        val stringRes = if (mBatteryHealth == BatteryManager.BATTERY_HEALTH_DEAD) {
+            R.string.battery_tip_replacement_summary
+        } else {
+            R.string.battery_tip_early_replacement_summary
+        }
+        return Html.fromHtml(context.getString(stringRes), 0);
+    }
+
+    override fun getIconId(): Int = R.drawable.ic_battery_alert_24dp
+
+    override fun updateState(tip: BatteryTip) {
+        mState = tip.state
+    }
+
+    override fun log(context: Context?, metricsFeatureProvider: MetricsFeatureProvider?) {
+        metricsFeatureProvider?.action(
+            context,
+            SettingsEnums.ACTION_BATTERY_HEALTH_TIP,
+            mState
+        )
+    }
+
+    override fun updatePreference(preference: Preference) {
+        super.updatePreference(preference)
+        val tipCardPref = preference as? BannerMessagePreference ?: return
+        tipCardPref.isSelectable = true
+        tipCardPref.onPreferenceClickListener = Preference.OnPreferenceClickListener onClick@ { _ ->
+            val context: Context = tipCardPref.context
+            val helpIntent = HelpUtils.getHelpIntent(
+                context,
+                context.getString(R.string.help_url_battery_replacement),
+                ""
+            ) ?: return@onClick true
+
+            try {
+                context.startActivity(helpIntent)
+            } catch (e: Exception) {
+                Log.e(TAG, "can't start action $helpIntent", e)
+            }
+            true
+        }
+    }
+
+    companion object CREATOR : Parcelable.Creator<BatteryReplacementTip> {
+        override fun createFromParcel(parcel: Parcel): BatteryReplacementTip {
+            return BatteryReplacementTip(parcel)
+        }
+
+        override fun newArray(size: Int): Array<BatteryReplacementTip?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
diff --git a/src/com/google/android/settings/fuelgauge/batterytip/CycleCountTipPreferenceController.kt b/src/com/google/android/settings/fuelgauge/batterytip/CycleCountTipPreferenceController.kt
new file mode 100644
index 00000000000..0a25a707fc6
--- /dev/null
+++ b/src/com/google/android/settings/fuelgauge/batterytip/CycleCountTipPreferenceController.kt
@@ -0,0 +1,123 @@
+package com.google.android.settings.fuelgauge.batterytip
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.BatteryManager
+import android.util.Log
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.preference.PreferenceScreen
+import com.android.settings.R
+import com.android.settings.core.BasePreferenceController
+import com.android.settingslib.widget.BannerMessagePreference
+import com.google.android.settings.fuelgauge.Utils
+
+class CycleCountTipPreferenceController(
+    context: Context,
+    key: String,
+) : BasePreferenceController(context, key), LifecycleEventObserver {
+    companion object {
+        /**
+         * An undocumented constant value for {@link BatteryManager#EXTRA_HEALTH}.
+         * It's defined in
+         * frameworks/native/services/batteryservice/include/batteryservice/BatteryServiceConstants.h
+         * but not exposed in frameworks {@link android.os.BatteryManager}
+         */
+        const val BATTERY_HEALTH_FAIR = 8
+        const val CYCLE_COUNT_THRESHOLD = 375
+        const val CYCLE_COUNT_UNAVAILABLE = -1
+        const val REQUIRED_DEVICE = "bluejay"
+        private const val TAG = "CycleCountTipPreferenceController"
+    }
+
+    private var batteryBroadcastReceiver: BroadcastReceiver? = null
+    private var cycleCountPreference: BannerMessagePreference? = null
+
+    override fun getAvailabilityStatus(): Int {
+        return if (Utils.isBarrelRequiredDevice(mContext)) {
+            AVAILABLE_UNSEARCHABLE
+        } else {
+            CONDITIONALLY_UNAVAILABLE
+        }
+    }
+
+    override fun displayPreference(screen: PreferenceScreen) {
+        super.displayPreference(screen)
+        val preference = screen.findPreference<BannerMessagePreference>(preferenceKey) ?: return
+        cycleCountPreference = preference
+        preference.setAttentionLevel(BannerMessagePreference.AttentionLevel.NORMAL)
+        // set later in updatePreference
+        preference.isVisible = false
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (Utils.isBarrelRequiredDevice(mContext)) {
+            when (event) {
+                Lifecycle.Event.ON_CREATE -> {
+                    batteryBroadcastReceiver = object : BroadcastReceiver() {
+                        override fun onReceive(context: Context?, intent: Intent) {
+                            updatePreference(intent)
+                        }
+                    }
+                }
+                Lifecycle.Event.ON_START -> {
+                    batteryBroadcastReceiver?.let {
+                        mContext.registerReceiver(it, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+                    }
+                }
+                Lifecycle.Event.ON_STOP -> {
+                    batteryBroadcastReceiver?.let { mContext.unregisterReceiver(it) }
+                }
+                else -> return
+            }
+        }
+    }
+
+    private fun getCycleCount(intent: Intent): Int {
+        val cycleCount = intent.getIntExtra(
+            BatteryManager.EXTRA_CYCLE_COUNT,
+            CYCLE_COUNT_UNAVAILABLE
+        )
+        Log.d(TAG, "cycleCount: $cycleCount")
+        return cycleCount
+    }
+
+    private fun shouldShowCycleCountTip(intent: Intent, cycleCount: Int): Boolean {
+        if (cycleCount < CYCLE_COUNT_THRESHOLD) {
+            return false
+        }
+
+        val health = intent.getIntExtra(
+            BatteryManager.EXTRA_HEALTH,
+            BatteryManager.BATTERY_HEALTH_UNKNOWN
+        )
+        Log.d(TAG, "healthStatus: $health")
+
+        return health == BATTERY_HEALTH_FAIR || health == BatteryManager.BATTERY_HEALTH_DEAD
+    }
+
+    private fun convertCycleCountToString(cycleCount: Int): CharSequence {
+        return if (cycleCount == CYCLE_COUNT_UNAVAILABLE) {
+            return mContext.getText(R.string.battery_cycle_count_not_available)
+        } else {
+            cycleCount.toString()
+        }
+    }
+
+    private fun updatePreference(intent: Intent) {
+        val cycleCount = getCycleCount(intent)
+        val shouldShowCycleCountTip = shouldShowCycleCountTip(intent, cycleCount)
+        Log.d(TAG, "shouldShowCycleCountTip: $shouldShowCycleCountTip")
+        if (shouldShowCycleCountTip) {
+            cycleCountPreference?.apply {
+                summary = convertCycleCountToString(cycleCount)
+                isVisible = true
+            }
+        } else {
+            cycleCountPreference?.isVisible = false
+        }
+    }
+}
diff --git a/src/com/google/android/settings/overlay/FeatureFactoryGoogleImpl.kt b/src/com/google/android/settings/overlay/FeatureFactoryGoogleImpl.kt
new file mode 100644
index 00000000000..15822de1358
--- /dev/null
+++ b/src/com/google/android/settings/overlay/FeatureFactoryGoogleImpl.kt
@@ -0,0 +1,16 @@
+package com.google.android.settings.overlay
+
+import com.google.android.settings.fuelgauge.BatterySettingsFeatureProviderGoogleImpl
+import com.android.settings.overlay.FeatureFactoryImpl
+import com.google.android.settings.fuelgauge.PowerUsageFeatureProviderGoogleImpl
+
+class FeatureFactoryGoogleImpl : FeatureFactoryImpl() {
+
+    override val powerUsageFeatureProvider by lazy {
+        PowerUsageFeatureProviderGoogleImpl(appContext)
+    }
+
+    override val batterySettingsFeatureProvider by lazy {
+        BatterySettingsFeatureProviderGoogleImpl()
+    }
+}
diff --git a/src/com/google/hardware/biometrics/sidefps/IFingerprintExt.aidl b/src/com/google/hardware/biometrics/sidefps/IFingerprintExt.aidl
new file mode 100644
index 00000000000..9fa1fd500e5
--- /dev/null
+++ b/src/com/google/hardware/biometrics/sidefps/IFingerprintExt.aidl
@@ -0,0 +1,5 @@
+package com.google.hardware.biometrics.sidefps;
+
+interface IFingerprintExt {
+    void resumeEnroll() = 1;
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
index d35457a8c84..864931bee7f 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
@@ -78,7 +78,9 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.biometrics.fingerprint.feature.FingerprintExtPreferencesProvider;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.biometrics.fingerprint.feature.PrimarySwitchIntentPreference;
+import com.android.settings.biometrics.fingerprint.feature.SfpsRestToUnlockFeature;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -159,6 +161,12 @@ public class FingerprintSettingsFragmentTest {
     private FingerprintAuthenticateSidecar mFingerprintAuthenticateSidecar;
     private FingerprintRemoveSidecar mFingerprintRemoveSidecar;
 
+    private FakeFeatureFactory mFeatureFactory;
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private SfpsRestToUnlockFeature mSfpsRestToUnlockFeature;
+
     @Before
     public void setUp() {
         ShadowUtils.setFingerprintManager(mFingerprintManager);
@@ -184,6 +192,13 @@ public void setUp() {
                 .getExtPreferenceProvider(mContext))
                 .thenReturn(mExtPreferencesProvider);
         when(mExtPreferencesProvider.getSize()).thenReturn(0);
+
+        when(mFakeFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
+                .thenReturn(mLockPatternUtils);
+        when(mFakeFeatureFactory.mFingerprintFeatureProvider.getSfpsRestToUnlockFeature(mContext))
+                .thenReturn(mSfpsRestToUnlockFeature);
+
+        when(mLockPatternUtils.checkUserSupportsBiometricSecondFactor(anyInt())).thenReturn(true);
     }
 
     @After
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
index 5666a30c94f..4a672056e0b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -138,7 +138,7 @@ public void onDialogPositiveClick_confirmationDialog_setPBAP() {
     public void onSetContactSharingState_permissionAllowed_setPBAPAllowed() {
         when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
                 BluetoothDevice.ACCESS_ALLOWED);
-        mBluetoothPairingController.setContactSharingState();
+        // mBluetoothPairingController.setContactSharingState();
         mBluetoothPairingController.onDialogPositiveClick(null);
 
         verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
@@ -149,7 +149,7 @@ public void onSetContactSharingState_permissionUnknown_audioVideoHandsfree_setPB
         when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
                 BluetoothDevice.ACCESS_UNKNOWN);
         when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
-        mBluetoothPairingController.setContactSharingState();
+        // mBluetoothPairingController.setContactSharingState();
         mBluetoothPairingController.onDialogPositiveClick(null);
 
         verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
@@ -160,7 +160,7 @@ public void onSetContactSharingState_permissionRejected_setPBAPRejected() {
         when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
                 BluetoothDevice.ACCESS_REJECTED);
         when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
-        mBluetoothPairingController.setContactSharingState();
+        // mBluetoothPairingController.setContactSharingState();
         mBluetoothPairingController.onDialogPositiveClick(null);
 
         verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
index 6ae670dc120..2af9242dab8 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -99,31 +99,6 @@ public void isDrivingModeAvailable_returnFalse() {
             AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse();
     }
 
-    @Test
-    public void isAndroidAutoSettingAvailable_returnTrue() {
-        final ApplicationInfo appInfo =
-                ApplicationInfoBuilder.newBuilder().setPackageName(ANDROID_AUTO_PACKAGE).build();
-        final ActivityInfo activityInfo = new ActivityInfo();
-        activityInfo.packageName = ANDROID_AUTO_PACKAGE;
-        activityInfo.name = ANDROID_AUTO_PACKAGE;
-        activityInfo.applicationInfo = appInfo;
-        final ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.activityInfo = activityInfo;
-        mShadowPackageManager.addResolveInfoForIntent(
-                buildAndroidAutoSettingsIntent(),
-                resolveInfo);
-
-        assertThat(
-            AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isTrue();
-    }
-
-    @Test
-    public void isAndroidAutoSettingAvailable_returnFalse() {
-        // No ResolveInfo for Android Auto, expect false.
-        assertThat(
-            AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isFalse();
-    }
-
     @Test
     public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeAvailable() {
         // NFC available, driving mode available
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java
index f7bd108e798..85122928b59 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PinPrivacyPreferenceControllerTest.java
@@ -29,7 +29,7 @@
 
 import androidx.preference.SwitchPreference;
 
-import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.WrappedLockPatternUtils;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -46,7 +46,7 @@ public class PinPrivacyPreferenceControllerTest {
     private static final int TEST_USER_ID = 0;
 
     @Mock
-    private LockPatternUtils mLockPatternUtils;
+    private WrappedLockPatternUtils mLockPatternUtils;
     private Context mContext;
     private PinPrivacyPreferenceController mController;
     private SwitchPreference mPreference;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index e3c684fd098..88bc63d9f9d 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -16,11 +16,12 @@
 
 package com.android.settings.wifi;
 
-import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_DEVICE_MAC;
-import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_PREF_INDEX_DEVICE_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC;
 import static com.android.settings.wifi.WifiConfigController.DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_ENABLE;
 import static com.android.settings.wifi.WifiConfigController.DHCP_SPINNER_INDEX_SEND_DHCP_HOST_NAME_DISABLE;
 
+import static com.android.settings.wifi.details2.WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.mock;
@@ -358,7 +359,7 @@ public void loadMacRandomizedValue_shouldMandomizedMacAsDefault() {
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
-                PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC);
+                PRIVACY_PREF_INDEX_PER_CONNECTION_RANDOMIZED_MAC);
     }
 
     @Test
@@ -383,8 +384,7 @@ private void checkSavedMacRandomizedValue(int macRandomizedValue) {
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
-                macRandomizedValue == WifiConfiguration.RANDOMIZATION_PERSISTENT
-                ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
+                translateWifiEntryPrivacyToPrefValue(macRandomizedValue));
     }
 
     @Test
@@ -397,7 +397,7 @@ public void saveMacRandomizedValue_noChanged_shouldPersistentAsDefault() {
     @Test
     public void saveMacRandomizedValue_ChangedToDeviceMac_shouldGetNone() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        privacySetting.setSelection(PRIVACY_SPINNER_INDEX_DEVICE_MAC);
+        privacySetting.setSelection(PRIVACY_PREF_INDEX_DEVICE_MAC);
 
         WifiConfiguration config = mController.getConfig();
         assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
index efea6fdeaaa..8f4b155bd6b 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.testutils.shadow;
 
+import static com.android.internal.widget.LockDomain.Primary;
+
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.PasswordMetrics;
 import android.content.ComponentName;
@@ -26,6 +28,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.internal.widget.LockDomain;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 
@@ -51,6 +54,8 @@ public class ShadowLockPatternUtils {
     private static Map<Integer, Boolean> sUserToBiometricAllowedMap = new HashMap<>();
     private static Map<Integer, Boolean> sUserToLockPatternEnabledMap = new HashMap<>();
     private static Map<Integer, Integer> sKeyguardStoredPasswordQualityMap = new HashMap<>();
+    private static Map<Integer, Integer> sKeyguardStoredPasswordQualityMapSecondary =
+            new HashMap<>();
 
     private static boolean sIsUserOwnsFrpCredential;
 
@@ -99,7 +104,14 @@ protected int getActivePasswordQuality(int userId) {
 
     @Implementation
     protected int getKeyguardStoredPasswordQuality(int userHandle) {
-        return sKeyguardStoredPasswordQualityMap.getOrDefault(userHandle, /* defaultValue= */ 1);
+        return getKeyguardStoredPasswordQuality(userHandle, Primary);
+    }
+
+    @Implementation
+    protected int getKeyguardStoredPasswordQuality(int userHandle, LockDomain lockDomain) {
+        Map<Integer, Integer> passwordQualityMap = lockDomain == Primary ?
+                sKeyguardStoredPasswordQualityMap : sKeyguardStoredPasswordQualityMapSecondary;
+        return passwordQualityMap.getOrDefault(userHandle, /* defaultValue= */ 1);
     }
 
     @Implementation
diff --git a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
index 5c9a1a4a932..a3893a85c13 100644
--- a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPageProviderTest.kt
@@ -85,7 +85,7 @@ class WifiPrivacyPageProviderTest {
         composeTestRule.setContent {
             WifiPrivacyPage(mockWifiEntry)
         }
-        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries)
+        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries_ext)
         for (entry in wifiPrivacyEntries) {
             composeTestRule.onNodeWithText(
                 entry
@@ -98,7 +98,7 @@ class WifiPrivacyPageProviderTest {
         composeTestRule.setContent {
             WifiPrivacyPage(mockWifiEntry)
         }
-        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries)
+        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries_ext)
         for (entry in wifiPrivacyEntries) {
             composeTestRule.onNodeWithText(
                 entry
@@ -111,8 +111,8 @@ class WifiPrivacyPageProviderTest {
         composeTestRule.setContent {
             WifiPrivacyPage(mockWifiEntry)
         }
-        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries)
-        val wifiPrivacyValues = context.resources.getStringArray(R.array.wifi_privacy_values)
+        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries_ext)
+        val wifiPrivacyValues = context.resources.getStringArray(R.array.wifi_privacy_values_ext)
         composeTestRule.onNodeWithText(
             wifiPrivacyEntries[wifiPrivacyValues.indexOf("0")]
         ).assertIsSelected()
@@ -126,7 +126,7 @@ class WifiPrivacyPageProviderTest {
         composeTestRule.setContent {
             WifiPrivacyPage(mockWifiEntry)
         }
-        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries)
+        val wifiPrivacyEntries = context.resources.getStringArray(R.array.wifi_privacy_entries_ext)
         for (entry in wifiPrivacyEntries) {
             composeTestRule.onNodeWithText(entry).assertIsNotEnabled()
         }
@@ -176,4 +176,4 @@ class WifiPrivacyPageProviderTest {
             context.getString(R.string.wifi_privacy_send_device_name_toggle_title)
         ).assertIsOff()
     }
-}
\ No newline at end of file
+}
diff --git a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
index 9b69e9def51..3df37aeb8f7 100644
--- a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
+++ b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
@@ -69,11 +69,11 @@ class WifiPrivacyPreferenceController2Test {
 
     private var preference =
         ListPreference(context).apply {
-            setEntries(R.array.wifi_privacy_entries)
-            setEntryValues(R.array.wifi_privacy_values)
+            setEntries(R.array.wifi_privacy_entries_ext)
+            setEntryValues(R.array.wifi_privacy_values_ext)
         }
 
-    private var preferenceStrings = context.resources.getStringArray(R.array.wifi_privacy_entries)
+    private var preferenceStrings = context.resources.getStringArray(R.array.wifi_privacy_entries_ext)
 
     @Test
     fun updateState_wifiPrivacy_setCorrectValue() {
diff --git a/tests/unit/src/com/android/settings/password/SaveAndFinishWorkerTest.java b/tests/unit/src/com/android/settings/password/SaveAndFinishWorkerTest.java
index 88e31508155..4f46fdedd5c 100644
--- a/tests/unit/src/com/android/settings/password/SaveAndFinishWorkerTest.java
+++ b/tests/unit/src/com/android/settings/password/SaveAndFinishWorkerTest.java
@@ -34,6 +34,47 @@
 
 @RunWith(AndroidJUnit4.class)
 public class SaveAndFinishWorkerTest {
+    // Unsure if this is still passing as unit tests are failing to run.
+    @Test
+    public void saveAndVerifyInBackground_returnCredentialsTrue_returnsCredentials() {
+        int userId = 0;
+        var chosenCredential = LockscreenCredential.createPassword("1234");
+        var currentCredential = LockscreenCredential.createNone();
+        var worker = new SaveAndFinishWorker();
+        var lpu = mock(LockPatternUtils.class);
+
+        when(lpu.setLockCredential(chosenCredential, currentCredential, userId)).thenReturn(true);
+
+        worker.setReturnCredentials(true);
+        worker.prepare(lpu, chosenCredential, currentCredential, userId);
+        var result = worker.saveAndVerifyInBackground();
+
+        verify(lpu).setLockCredential(chosenCredential, currentCredential, userId);
+        assertThat(result.first).isTrue();
+        assertThat(result.second.getParcelableExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, LockscreenCredential.class))
+                .isEqualTo(chosenCredential);
+    }
+
+    // Unsure if this is still passing as unit tests are failing to run.
+    @Test
+    public void saveAndVerifyInBackground_returnCredentialsFalse_notReturnCredentials() {
+        int userId = 0;
+        var chosenCredential = LockscreenCredential.createPassword("1234");
+        var currentCredential = LockscreenCredential.createNone();
+        var worker = new SaveAndFinishWorker();
+        var lpu = mock(LockPatternUtils.class);
+
+        when(lpu.setLockCredential(chosenCredential, currentCredential, userId)).thenReturn(true);
+
+        worker.prepare(lpu, chosenCredential, currentCredential, userId);
+        var result = worker.saveAndVerifyInBackground();
+
+        verify(lpu).setLockCredential(chosenCredential, currentCredential, userId);
+        assertThat(result.first).isTrue();
+        assertThat(result.second).isNull();
+    }
+
     @Test
     public void testSetRequestWriteRepairModePassword_setLockCredentialFail() {
         int userId = 0;