[automerger skipped] Merge "Add more unit test for doh" into mainline-prod am:...

[automerger skipped] Merge "Add more unit test for doh" into mainline-prod am: c706d7e1 -s ours am: 154d1dbd -s ours am: 2c31c62f -s ours

am skip reason: Merged-In Idf0a7f695c877bc5818ab5fc81133d35a38925dc with SHA-1 64d6d3a3 is already in history

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

Change-Id: I040fa7c75e73da2639104ff34947a85ac7a20f57