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

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

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