Merge "Replace some netd calls in NetworkManagementService" am: 7586d33f22 am: 2e42a1e5e9

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

Change-Id: I96e5265e882addb1dde54acf8a44888ebd5b9a4d