am a507ce10: Merge "Add a simple test for NetworkManagementService." into klp-dev am: 869f9566fb

Original change: undetermined

Change-Id: I650609cd64fb5994f4c668c6c29b26dc15bf331b