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

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

Change-Id: I9c26d1adccfabab9d4c14c65ab4de3a57f63739c