Merge "Use new test utilities from frameworks/libs/net" am: 2087f3eeb1 am: e532ab3e37

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

Change-Id: I1b50cce467aeb041975d43811d1e3d27bb3836fb
tree: 9ccfbd59fe35c6eb563ce93b3a159e01fb4f2b56
  1. tests/