Merge "Use public API of NetworkAgent in TestNetworkService" am: 0903bf5de7

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

Change-Id: If37614f211ea2cddb98f06b95b9dfe32e5a98cb5