[automerger skipped] Fix the multi arch issue of resolv_unit_test. am:...

[automerger skipped] Fix the multi arch issue of resolv_unit_test. am: 9d7f160e am: 06f483fd am: 63571e37 -s ours

am skip reason: Change-Id If4790cb710c35d6fd3d562b3eb4205d1cba24a50 with SHA-1 9d7f160e is in history

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

Change-Id: I2e6b406e4243c68075f702fab4483a665d8b8817