Merge "NetworkManagementService.java: fix error-prone warnings"
am: 44b7e94a7c

Change-Id: I7cade535f2bca308446aa91d4368ee41b62daa9b