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

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

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