Merge "Add system_server to net_admin group" am: f584f880ab

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978086

Change-Id: Ib31801f005d3130f6fa024885788effae49b1759