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

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

Change-Id: Icf92bead82e8f7627ed961e0d92174d645540cc5