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

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

Change-Id: Ic06312316386b8ea2576a257777638cdafccd2ae