Merge "Refactoring 5g utils" am: 42a1f86ca4

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1700133

Change-Id: I9839b67e539f2985227aac34320d3a13a83e5679