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

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

Change-Id: Ia265f482f1dd0750b1dab72b525886b4d63d43a4