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

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

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