Merge "Adding native flag namespace for lmkd." into sc-dev

core/java/android/provider/DeviceConfig.java

@@ -257,6 +257,13 @@ public final class DeviceConfig {
     @TestApi
     public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";
 
+    /**
+     * Namespace for all lmkd related features.
+     *
+     * @hide
+     */
+    public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";
+
     /**
      * Namespace for all location related features.
      *

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

@@ -84,6 +84,7 @@ public class SettingsToPropertiesMapper {
         DeviceConfig.NAMESPACE_CONNECTIVITY,
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,
+        DeviceConfig.NAMESPACE_LMKD_NATIVE,
         DeviceConfig.NAMESPACE_MEDIA_NATIVE,
         DeviceConfig.NAMESPACE_NETD_NATIVE,
         DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,