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

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

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