net.dns patch 2/2

diff --git a/api/system-current.txt b/api/system-current.txt
index 6d30669637b9..3d9156ecb58f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8967,6 +8967,7 @@ package android.os {
     method public static boolean getBoolean(@NonNull String, boolean);
     method public static int getInt(@NonNull String, int);
     method public static long getLong(@NonNull String, long);
+    method public static void set(@NonNull String, @Nullable String);
   }

   public class SystemUpdateManager {
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 16c5253427a8..0de48824aba4 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -8569,6 +8569,7 @@ package android.os {
     method public static boolean getBoolean(@NonNull String, boolean);
     method public static int getInt(@NonNull String, int);
     method public static long getLong(@NonNull String, long);
+    method public static void set(@NonNull String, @Nullable String);
   }

   public class SystemUpdateManager {
diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index ab741990430f..2803966e05e9 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -223,7 +223,7 @@ public class SystemProperties {
      * SELinux. libc will log the underlying reason.
      * @hide
      */
-    @UnsupportedAppUsage
+    @SystemApi
     public static void set(@NonNull String key, @Nullable String val) {
         if (val != null && !val.startsWith("ro.") && val.length() > PROP_VALUE_MAX) {
             throw new IllegalArgumentException("value of system property '" + key