Merge "[CLATJ#30] Not allow tagSocket() to tag with uid AID_CLAT" am: edf80c2da8

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

Change-Id: If3401980ef1b7458b1e9252748e7671a873812f0