Merge "Use function inside NetdUtils instead of NetworkManagementService"