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

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

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