[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 skip reason: skip tag Change-Id Idf0a7f695c877bc5818ab5fc81133d35a38925dc with SHA-1 ac1ce2f4 is already in history

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

Change-Id: If719fe572f5d3d26f31f0e6fb38ee124489dc82a