[automerger skipped] Fix OOB read in DNS resolver am: 11ad8ac8 am:...

[automerger skipped] Fix OOB read in DNS resolver am: 11ad8ac8 am: 5ecea437 -s ours am: 0de09ea0 -s ours am: dd057fa1 -s ours

am skip reason: Change-Id I1ff2dc09f41f76973c5f066b07b15388e722b375 with SHA-1 820f6e44 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/12325645

Change-Id: Id568e6eaba7611884f122e1b938b8248469e8c41