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

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

Change-Id: I25f6e3ac57801e9e960d0f879a33bfea74a9c940