Merge "NetworkManagementService.java: fix error-prone warnings"