[automerger skipped] DnsResolver/getaddrinfo.cpp - fixes bugprone-branch-clone...

[automerger skipped] DnsResolver/getaddrinfo.cpp - fixes bugprone-branch-clone warning am: 5db95b4d am: bc7ade17 am: 9e4af4a2 -s ours

am skip reason: Change-Id I03ab16a8841e1389245fe6889ff6f82e2c3063ac with SHA-1 5db95b4d is in history

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

Change-Id: I2bd06059e3029b80523c0b207e713c51b9518857