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

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

Change-Id: I6b33918fd9f161cea5b73c90cdf253db64a3a700
tree: 98c432e9302429a5c8f1d8bb1b6eafb08fff4067
  1. tests/