Merge "Translate v4 keepalive packet on clat started network to v6" am: 7e1076e174 am: 0909e69e53

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

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