Merge "Use new test utilities from frameworks/libs/net" am: 8721ada4b5

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

Change-Id: I47647272686d5180b579c2190c74ec6c28f1a8e5