[automerger skipped] Fix OOB read in DNS resolver am: 5214c6be am:...

[automerger skipped] Fix OOB read in DNS resolver am: 5214c6be am: d0fbe04a am: b402b11f am: 86a64fd3 -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: I8f44726e3d6f38f88e67051c29390d94a32942e0