Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: d6dee71740

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

Change-Id: I4deed4292a20df70cfefc7ffb3b0ad76fda3d393