Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"