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

Change-Id: I38905b12f24f16860de1db18cd12d93fc661c684