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

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

Change-Id: I595116f9996eca55f60708bfb817577a8b5b624b