Merge "Replace some netd calls in NetworkManagementService" am: d73310c2e9 am: 08e5c0b1f6

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

Change-Id: Ie6e3c88c52522c5440a746e34bbc6642a59ab959