Merge "Handle v4-mapped v6 address in Struct parsing" into main am: d232211291

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2807798

Change-Id: Ifec52e06b6692f950b2bc42ea37d654514e9fe10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>