Merge "Replace some netd calls in NetworkManagementService"