Merge "clat: enable PACKET_VNET_HDR on v6 ingress" am: b21fe216cc am: d4075782f3

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

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