Merge "Use public API of NetworkAgent in TestNetworkService" am: 8c3e4377cc am: 95c3ea2068

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

Change-Id: I69d46565edcbe7dd64dea63ab6d04143884e2bd5
tree: ec5b84265f1e1ea60ba4da8cab61ba2e7e1f1f31
  1. core/
  2. services/
  3. tests/