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

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

Change-Id: I35fb80fc8cfb90760be7b11f58c1a7746c417c44