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

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

Change-Id: Iaca0bd6605eec759bcb586cbe3fc1a6bf310ee37