Merge "Create v4 mapped v6 correctly" into main am: 49ef2e917c

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

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