Merge "change NMS removeNetwork to netd binder variant"
am: e61ee4198e

Change-Id: I789653740c8cb1bb879215eaa3101f56d5bf7096