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

[automerger skipped] Fix OOB read in DNS resolver am: 5214c6be am: d0fbe04a am: a37a359a am: d8e1caa4 -s ours am: bf49fe4d -s ours

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

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

Change-Id: I8197b6d832d176932547e47a3087c5d086206db7