[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 am: 6a5ad4c9 -s ours am: a259444f -s ours

am skip reason: Merged-In I158691c7e62696fe3613ad5841cab01b45354b6c with SHA-1 5921a874 is already in history

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

Change-Id: I580b7b1c603fe27d71df97bca536f9ab644a88ed