[automerger skipped] DnsResolver/getaddrinfo.cpp - fixes bugprone-branch-clone warning am: 5db95b4d -s ours
am skip reason: Change-Id I03ab16a8841e1389245fe6889ff6f82e2c3063ac with SHA-1 c37d081d is in history
Change-Id: Ia20b4cc6f88ffaedbaca9478c28180376329cb8d