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

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

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