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

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

Change-Id: I678af09393ff7ddaccd614a9281ccd8911dd33cc