Merge "Use new test utilities from frameworks/libs/net" am: 120a5c9f06

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

Change-Id: If20f92cef864fcaa05339cff32758a6295b6623b