Merge "Add system_server to net_admin group" am: f584f880ab am: 0cd6e77d0e

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

Change-Id: Ied6448fb2f73d8867463357d6eacc7fbe00ddaea