[automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours am: c0b2c8af16 -s ours

am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 e5bdc06735 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: Ib65c0bff5a07638e9335b02dc2494f7e3d6a6176