Merge "Replace dns_tls with private_dns_mode setting" am: 8cf645c04d

am: f1799116c2

Change-Id: I3e0448c045eb1072d0cd70a163ca355786b21cc4

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/provider/Settings.java
index 45e17e0,6981ffc..6dd345c
--- 1/core/java/android/provider/Settings.java
--- 2/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@@ -10334,13 -10213,11 +10343,15 @@@ public final class Settings 
              DOCK_AUDIO_MEDIA_ENABLED,
              ENCODED_SURROUND_OUTPUT,
              LOW_POWER_MODE_TRIGGER_LEVEL,
-             BLUETOOTH_ON
+             BLUETOOTH_ON,
+             PRIVATE_DNS_MODE,
+             PRIVATE_DNS_SPECIFIER
          };
  
 +        /** @hide */
 +        public static final String[] LEGACY_RESTORE_SETTINGS = {
 +        };
 +
          private static final ContentProviderHolder sProviderHolder =
                  new ContentProviderHolder(CONTENT_URI);
  

diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge

diff --cc packages/SettingsLib/res/values/strings.xml
Simple merge

diff --cc services/core/java/com/android/server/NetworkManagementService.java
Simple merge