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

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

Change-Id: Iaff63bc436df87cc86301602cc0af06edaffc4fe