Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22

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

Change-Id: I98a0a978682346855625b5d9673a47c9ae0fd22a