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

am skip reason: skipped by user cken

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

Change-Id: I6769f910bed52c2c8eced82c9e0afaf9ecb34e18