[automerger skipped] Fix OOB read in DNS resolver am: 5214c6be am: 339d9ea4 -s ours am: 5f7e4234 -s ours

am skip reason: Change-Id Id4b5df1be4652e4623847b0b0bad0af65b80fdd5 with SHA-1 5214c6be is in history

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

Change-Id: I66120e9bd3eb61da05da42052fcf024d2227a26d