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

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

Change-Id: Idb6fe861b24b628fb9e3eafeb7ca447f171b9e28