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

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

Change-Id: I69d46565edcbe7dd64dea63ab6d04143884e2bd5