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

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

Change-Id: I0ecaefff87cd61475f11052fd6b0c0f336c27f6e