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

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

Change-Id: If6297fbe0632f1c18fa7ca1fbecc7fe2a22047c6