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

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

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