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

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

Change-Id: I278136f478fe975d8aa1941e19e837d9932f7b5a