[automerger skipped] Merge "Use new test utilities from frameworks/libs/net" into mainline-prod am: e39b923bdd -s ours

am skip reason: Change-Id I0d938e2967f3adc324dd2bc81138b4b2910af5f8 with SHA-1 8b8e27df06 is in history

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

Change-Id: Ide9671f14b1284ca4174ac1d9cef88285f2344f7
tree: 7cea4b1c23c5e97b17cd1dd7c4be91139b1f4a0b
  1. tests/