Merge \"Add UIDs for system DNS and tethering DNS\"

am: c4dc4f3fc2

Change-Id: I40d246a3d4c293797ae5204cebd61b50c4021205

include/private/android_filesystem_config.h

@@ -92,6 +92,8 @@
 #define AID_FIREWALL      1048  /* firewalld process */
 #define AID_TRUNKS        1049  /* trunksd process (TPM daemon) */
 #define AID_NVRAM         1050  /* Access-controlled NVRAM */
+#define AID_DNS           1051  /* DNS resolution daemon (system: netd) */
+#define AID_DNS_TETHER    1052  /* DNS resolution daemon (tether: dnsmasq) */
 /* Changes to this file must be made in AOSP, *not* in internal branches. */
 
 #define AID_SHELL         2000  /* adb and debug shell user */
@@ -203,6 +205,8 @@ static const struct android_id_info android_ids[] = {
     { "firewall",      AID_FIREWALL, },
     { "trunks",        AID_TRUNKS, },
     { "nvram",         AID_NVRAM, },
+    { "dns",           AID_DNS, },
+    { "dns_tether",    AID_DNS_TETHER, },
 
     { "shell",         AID_SHELL, },
     { "cache",         AID_CACHE, },