[automerger skipped] Merge "Add more unit test for doh" am: 9310ca22 am:...

[automerger skipped] Merge "Add more unit test for doh" am: 9310ca22 am: 36a05f5a -s ours am: 1a9ec549 -s ours am: a4d67550 -s ours am: 5242fca0 -s ours

am skip reason: Merged-In I616933251aec49c60c850198c0594861009c2bb8 with SHA-1 0ce8055d is already in history

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

Change-Id: I7c2ce761ef85393512a6a9b868e65109231378e9