Merge "clat: just always set mark unconditionally" am: 5708b1c7df

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

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