Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2 am: 3685f8334a am: 1adf3d8224

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114

Change-Id: Ic1b64df21cba8049df90c7c988f677a1a587e159