Merge "Fix the unexpected getaddrinfo error code changing due to parallel...

Merge "Fix the unexpected getaddrinfo error code changing due to parallel lookup" am: 8f58a580 am: 71300d18 am: ea66f37f am: ab694338

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

Change-Id: I86a19eacd2c04768d2401ad4a63aaca0272a68a5