[automerger skipped] Make doh_unit_test and doh_ffi_test can be run on the R...

[automerger skipped] Make doh_unit_test and doh_ffi_test can be run on the R platfrom am: 5921a874 -s ours

am skip reason: Merged-In I158691c7e62696fe3613ad5841cab01b45354b6c with SHA-1 5e60de17 is already in history

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

Change-Id: I002edcb1da0d9c108d995d559c9f091abb0aaabd