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

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

Change-Id: Ia244634500665ff267f879eb8bea7a84eca70bbb