Merge "DnsResolverTest: Use AndroidJUnit4.class" am: 85509fb3e4 am: 7e184fc11e am: 99292155a2 am: 7dca331853

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

Change-Id: I0dda9afb6b107dbfc4c44330123bc6687456496c