Merge "Add config for the system supervision package."

core/api/system-current.txt

@@ -384,6 +384,7 @@ package android {
     field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035
     field public static final int config_systemShell = 17039402; // 0x104002a
     field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e
+    field public static final int config_systemSupervision;
     field public static final int config_systemTelevisionNotificationHandler = 17039409; // 0x1040031
     field public static final int config_systemTextIntelligence = 17039414; // 0x1040036
     field public static final int config_systemUi = 17039418; // 0x104003a

core/res/res/values/config.xml

@@ -4697,6 +4697,9 @@
     only. The component must be part of a system app. -->
     <string name="config_defaultSupervisionProfileOwnerComponent" translatable="false"></string>
 
+    <!-- The package name of the default supervision package. -->
+    <string name="config_systemSupervision" translatable="false"></string>
+
     <!-- Trigger a warning for notifications with RemoteView objects that are larger in bytes than
     this value (default 1MB)-->
     <integer name="config_notificationWarnRemoteViewSizeBytes">2000000</integer>

core/res/res/values/public.xml

@@ -3315,7 +3315,9 @@
   <staging-public-group type="style" first-id="0x0dfd0000">
   </staging-public-group>
 
-  <staging-public-group type="string" first-id="0x0dfc0000">
+  <staging-public-group type="string" first-id="0x01dc0000">
+    <!-- @hide @SystemApi -->
+    <public name="config_systemSupervision" />
   </staging-public-group>
 
   <staging-public-group type="dimen" first-id="0x01db0000">