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

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

Change-Id: Id85779fe63e748f4a4f488cde3a9d971061e4464