Cleanup of Test Network service

This follow-up change performs some cleanup changes without affecting
functionality

Bug: 72950854
Test: Compiles, CTS tests using this pass
Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236
Merged-In: Ic7394f24f11d713c9374b438182e29d2a02ea236
(cherry picked from commit 5f6bc9d4385e2c13378988887a7eb3609ce17540)
3 files changed
tree: ab1d4cc143a0e0049b398f751ac3be1270e4e659
  1. core/
  2. services/
  3. tests/