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

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

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