Merge "Save uid netd network permissions" am: 6fafdc1548 am: b0a10cd127 am: 33c6908ef1

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

Change-Id: I5da3391ff6f1f8f51afc09e625c14b5cdd5dd659