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: Ie18ce421f0cb43703f533e5e94033233472cce28