Snap for 9899688 from 656085fc231cf48c64a558b56ec96fb0591fcc5e to udc-d1-release

Change-Id: Ibdb652efc388ba017cf9ef24c10e1af0fd2b19cd
diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index 59d66ea..cfe7cf7 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -49,6 +49,7 @@
     field public static final String NAMESPACE_CREDENTIAL = "credential_manager";
     field @Deprecated public static final String NAMESPACE_DEX_BOOT = "dex_boot";
     field public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager";
+    field public static final String NAMESPACE_EDGETPU_NATIVE = "edgetpu_native";
     field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
     field public static final String NAMESPACE_HDMI_CONTROL = "hdmi_control";
     field public static final String NAMESPACE_HEALTH_FITNESS = "health_fitness";
diff --git a/framework/java/android/provider/DeviceConfig.java b/framework/java/android/provider/DeviceConfig.java
index 266a0c5..e9254b9 100644
--- a/framework/java/android/provider/DeviceConfig.java
+++ b/framework/java/android/provider/DeviceConfig.java
@@ -240,6 +240,14 @@
     public static final String NAMESPACE_CAPTIVEPORTALLOGIN = "captive_portal_login";
 
     /**
+     * Namespace for all EdgeTpu related features.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String NAMESPACE_EDGETPU_NATIVE = "edgetpu_native";
+
+    /**
      * Namespace for all HealthFitness related features.
      *
      * @hide