[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 am: 806bdf12 -s ours am: efb0f1c8 -s ours am: 79c99d3a -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: I2e9a43a3dd5e31ec1f0a5a032742e4e2835eb6c5