Clean Up NetworkManagementService Tests am: 73a74fa6dd am: b2e7bdd8ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505233

Change-Id: Icaee85a789737c2b10f01aa7d7a669e9f7385bd7