Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: 3af01e2f46
am: e374524144

Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d