[automerger skipped] Fix OOB read in DNS resolver am: 11ad8ac8e1 am: 5ecea437ef -s ours am: 0de09ea0ca am: 558482bfbf

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

Change-Id: I6fffd7fd6b1093262ccd50f0b0f3948c1d35b8e3