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

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

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

Change-Id: If977ed563125b0d9f4afe0757d951c500d2366eb