Merge "Revert "Use new test utilities from frameworks/libs/net"" am: dcc8bf6706

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

Change-Id: I9c26d1adccfabab9d4c14c65ab4de3a57f63739c
tree: 641782a4bb6a5368c9c61c70e941fea5af6b20b2
  1. tests/