Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0 am: 55180757fb am: 79e835cda3

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

Change-Id: I3a6e8a8e0ab4e0eeedb3f109b3f89b06c870195e