Test: Refactor PrefixDiscoveryBypassTls am: 9504c685 am: 83f45990 am:...

Test: Refactor PrefixDiscoveryBypassTls am: 9504c685 am: 83f45990 am: 8817aaa6 am: fa166e9d am: 4d7bdc57

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



Change-Id: Ie097a97eca4a8dd28fb45a8cadc6b68960cfdb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>