Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 30a0fe39fd am: ac2004ef29 am: bffb479a2f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e3394be59677823631e551f83484f1a2514b274