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

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

Change-Id: I53f8f87338c8bb1bf6c91f94a6be2445a98ed415