Merge "Remove NetdService, NetworkStackClient dependency" am: 062fda1fb3

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

Change-Id: I5584ab9f1aec16530c9c86cf40423eb773118541