Merge "change NMS removeNetwork to netd binder variant"