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

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

Change-Id: I157639c1504c44ce2070b7d4a1ce2086742e3039