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

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

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