[automerger skipped] Add doh_unit_test target am: d5870282 am: 6ab46595 -s...

[automerger skipped] Add doh_unit_test target am: d5870282 am: 6ab46595 -s ours am: b2d65d40 -s ours am: dba9af1c -s ours am: 06c33904 -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/+/1669634

Change-Id: Id115b4c4cf6f6e641e27e17576c67c07097e270f