Merge "netd.c - cleanup AID_CLAT handling" am: ab35e1d453 am: c88610393d

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

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