Merge "DnsResolverTest: Use AndroidJUnit4.class" am: 85509fb3e4 am: 5fba4ce267

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

Change-Id: I126461644d826203d27abc8a357152e40ed6a258