Merge "Delete custom test_config used by doh_unit_test" am: dc770b42 am:...

Merge "Delete custom test_config used by doh_unit_test" am: dc770b42 am: f5dbc91d am: ab435b63

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



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