diff --git a/api/current.txt b/api/current.txt
index b73214f79d32a..55aa466c4a2a3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2114,22 +2114,6 @@ package android {
     field public static final int Theme_Light_Panel = 16973914; // 0x103005a
     field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
     field public static final int Theme_Material = 16974372; // 0x1030224
-    field public static final int Theme_Material_DayNight = 16974552; // 0x10302d8
-    field public static final int Theme_Material_DayNight_DarkActionBar = 16974553; // 0x10302d9
-    field public static final int Theme_Material_DayNight_Dialog = 16974554; // 0x10302da
-    field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974560; // 0x10302e0
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974561; // 0x10302e1
-    field public static final int Theme_Material_DayNight_Dialog_Alert = 16974555; // 0x10302db
-    field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974556; // 0x10302dc
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974557; // 0x10302dd
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974558; // 0x10302de
-    field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974559; // 0x10302df
-    field public static final int Theme_Material_DayNight_NoActionBar = 16974562; // 0x10302e2
-    field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974563; // 0x10302e3
-    field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974564; // 0x10302e4
-    field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974565; // 0x10302e5
-    field public static final int Theme_Material_DayNight_Panel = 16974566; // 0x10302e6
     field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
     field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
     field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
@@ -2143,7 +2127,7 @@ package android {
     field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
     field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
     field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
-    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
+    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974552; // 0x10302d8
     field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
     field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
     field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
diff --git a/api/system-current.txt b/api/system-current.txt
index 84dbe6254b91b..e3ee53eabea91 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2215,22 +2215,6 @@ package android {
     field public static final int Theme_Light_Panel = 16973914; // 0x103005a
     field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
     field public static final int Theme_Material = 16974372; // 0x1030224
-    field public static final int Theme_Material_DayNight = 16974552; // 0x10302d8
-    field public static final int Theme_Material_DayNight_DarkActionBar = 16974553; // 0x10302d9
-    field public static final int Theme_Material_DayNight_Dialog = 16974554; // 0x10302da
-    field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974560; // 0x10302e0
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974561; // 0x10302e1
-    field public static final int Theme_Material_DayNight_Dialog_Alert = 16974555; // 0x10302db
-    field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974556; // 0x10302dc
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974557; // 0x10302dd
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974558; // 0x10302de
-    field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974559; // 0x10302df
-    field public static final int Theme_Material_DayNight_NoActionBar = 16974562; // 0x10302e2
-    field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974563; // 0x10302e3
-    field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974564; // 0x10302e4
-    field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974565; // 0x10302e5
-    field public static final int Theme_Material_DayNight_Panel = 16974566; // 0x10302e6
     field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
     field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
     field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
@@ -2244,7 +2228,7 @@ package android {
     field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
     field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
     field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
-    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
+    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974552; // 0x10302d8
     field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
     field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
     field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
diff --git a/api/test-current.txt b/api/test-current.txt
index 390a017bd4011..73f8c4d89e128 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2114,22 +2114,6 @@ package android {
     field public static final int Theme_Light_Panel = 16973914; // 0x103005a
     field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
     field public static final int Theme_Material = 16974372; // 0x1030224
-    field public static final int Theme_Material_DayNight = 16974552; // 0x10302d8
-    field public static final int Theme_Material_DayNight_DarkActionBar = 16974553; // 0x10302d9
-    field public static final int Theme_Material_DayNight_Dialog = 16974554; // 0x10302da
-    field public static final int Theme_Material_DayNight_DialogWhenLarge = 16974560; // 0x10302e0
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_DarkActionBar = 16974568; // 0x10302e8
-    field public static final int Theme_Material_DayNight_DialogWhenLarge_NoActionBar = 16974561; // 0x10302e1
-    field public static final int Theme_Material_DayNight_Dialog_Alert = 16974555; // 0x10302db
-    field public static final int Theme_Material_DayNight_Dialog_MinWidth = 16974556; // 0x10302dc
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar = 16974557; // 0x10302dd
-    field public static final int Theme_Material_DayNight_Dialog_NoActionBar_MinWidth = 16974558; // 0x10302de
-    field public static final int Theme_Material_DayNight_Dialog_Presentation = 16974559; // 0x10302df
-    field public static final int Theme_Material_DayNight_NoActionBar = 16974562; // 0x10302e2
-    field public static final int Theme_Material_DayNight_NoActionBar_Fullscreen = 16974563; // 0x10302e3
-    field public static final int Theme_Material_DayNight_NoActionBar_Overscan = 16974564; // 0x10302e4
-    field public static final int Theme_Material_DayNight_NoActionBar_TranslucentDecor = 16974565; // 0x10302e5
-    field public static final int Theme_Material_DayNight_Panel = 16974566; // 0x10302e6
     field public static final int Theme_Material_Dialog = 16974373; // 0x1030225
     field public static final int Theme_Material_DialogWhenLarge = 16974379; // 0x103022b
     field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974380; // 0x103022c
@@ -2143,7 +2127,7 @@ package android {
     field public static final int Theme_Material_Light_DarkActionBar = 16974392; // 0x1030238
     field public static final int Theme_Material_Light_Dialog = 16974393; // 0x1030239
     field public static final int Theme_Material_Light_DialogWhenLarge = 16974399; // 0x103023f
-    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974567; // 0x10302e7
+    field public static final int Theme_Material_Light_DialogWhenLarge_DarkActionBar = 16974552; // 0x10302d8
     field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974400; // 0x1030240
     field public static final int Theme_Material_Light_Dialog_Alert = 16974394; // 0x103023a
     field public static final int Theme_Material_Light_Dialog_MinWidth = 16974395; // 0x103023b
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index ad36f3c107bc3..09c17179b4b53 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2686,23 +2686,7 @@
     <public type="attr" name="languageTag" />
     <public type="attr" name="pointerShape" />
 
-    <public type="style" name="Theme.Material.DayNight" />
-    <public type="style" name="Theme.Material.DayNight.DarkActionBar" />
-    <public type="style" name="Theme.Material.DayNight.Dialog" />
-    <public type="style" name="Theme.Material.DayNight.Dialog.Alert" />
-    <public type="style" name="Theme.Material.DayNight.Dialog.MinWidth" />
-    <public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar" />
-    <public type="style" name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" />
-    <public type="style" name="Theme.Material.DayNight.Dialog.Presentation" />
-    <public type="style" name="Theme.Material.DayNight.DialogWhenLarge" />
-    <public type="style" name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" />
-    <public type="style" name="Theme.Material.DayNight.NoActionBar" />
-    <public type="style" name="Theme.Material.DayNight.NoActionBar.Fullscreen" />
-    <public type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" />
-    <public type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" />
-    <public type="style" name="Theme.Material.DayNight.Panel" />
     <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />
-    <public type="style" name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" />
 
     <public type="id" name="accessibilityActionSetProgress" />
     <public type="id" name="icon_frame" />
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 832984ea18135..f6326f7232982 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2389,4 +2389,22 @@
   <java-symbol type="layout" name="work_widget_mask_view" />
   <java-symbol type="id" name="work_widget_app_icon" />
   <java-symbol type="drawable" name="work_widget_mask_view_background" />
+
+  <!-- Framework-private Material.DayNight styles. -->
+  <java-symbol type="style" name="Theme.Material.DayNight" />
+  <java-symbol type="style" name="Theme.Material.DayNight.DarkActionBar" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog.Alert" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog.MinWidth" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog.NoActionBar" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog.NoActionBar.MinWidth" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Dialog.Presentation" />
+  <java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge" />
+  <java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge.NoActionBar" />
+  <java-symbol type="style" name="Theme.Material.DayNight.NoActionBar" />
+  <java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.Fullscreen" />
+  <java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.Overscan" />
+  <java-symbol type="style" name="Theme.Material.DayNight.NoActionBar.TranslucentDecor" />
+  <java-symbol type="style" name="Theme.Material.DayNight.Panel" />
+  <java-symbol type="style" name="Theme.Material.DayNight.DialogWhenLarge.DarkActionBar" />
 </resources>
diff --git a/packages/WallpaperCropper/res/values/styles.xml b/packages/WallpaperCropper/res/values/styles.xml
index e438c84027dbf..0f9e247f1c2b6 100644
--- a/packages/WallpaperCropper/res/values/styles.xml
+++ b/packages/WallpaperCropper/res/values/styles.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.Material.DayNight">
+    <style name="Theme.WallpaperCropper" parent="@*android:style/Theme.Material.DayNight">
         <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowActionBarOverlay">true</item>
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 189ed332abef6..fb5f21ab9ca68 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -141,6 +141,14 @@ public final class SystemServer {
             "com.android.server.MountService$Lifecycle";
     private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
 
+    /**
+     * Default theme used by the system context. This is used to style
+     * system-provided dialogs, such as the Power Off dialog, and other
+     * visual content.
+     */
+    private static final int DEFAULT_SYSTEM_THEME =
+            com.android.internal.R.style.Theme_Material_DayNight_DarkActionBar;
+
     private final int mFactoryTestMode;
     private Timer mProfilerSnapshotTimer;
 
@@ -320,7 +328,7 @@ public final class SystemServer {
     private void createSystemContext() {
         ActivityThread activityThread = ActivityThread.systemMain();
         mSystemContext = activityThread.getSystemContext();
-        mSystemContext.setTheme(android.R.style.Theme_Material_DayNight_DarkActionBar);
+        mSystemContext.setTheme(DEFAULT_SYSTEM_THEME);
     }
 
     /**