Merge "possibly fix clat ingress nat64 drop" into main am: cc677b3116 am: fb6caae204

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

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