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

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

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