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

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

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