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

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

Change-Id: Id4455e3090e555667d15461fc33fecf5333079bd