Merge "Use new test utilities from frameworks/libs/net" am: 1bc58efade am: c7fa8ea404

Original change: https://android-review.googlesource.com/c/platform/cts/+/1455935

Change-Id: I5f600d2e8e3c1629e8cd0750beee8bb47638c8db
tree: 8970652d4eafd7a985f3cba59024eb86693d9291
  1. tests/