Merge "Fix restorePrivateDnsSetting with null hostnames" am: 0103375187

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

Change-Id: I604e6d94640f36b37a628aa77e6df0fb709e2d85