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

Change-Id: Ia89fdb05890d40b1299c666a4535b4e9a8640323