Merge "[MS33.1] Remove NetdService dependency" am: eefefd1255 am: fff0b00b8a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935971

Change-Id: I2fad9ae301da9005a3ea424b54e0925d2d8dfbb1