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

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

Change-Id: I4beb93faa754519054775801a558aabe38a6a7cd