Merge "verify CLAT_MARK matches aidl constant." am: 3b4612b15a

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

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