Merge "Limit the translation code on NAT-T keepalive" into main am: 7f8015fe9e am: 42d3047701

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

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