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

[automerger skipped] Add doh_unit_test target am: d5870282 am: 6ab46595 am: 4f6c1643 -s ours am: 29cb2c8e -s ours am: 8fca05b6 -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: I11f2c3d3f7ebc3118e604a54ee6f308348111ff2