Merge "Refactor TetheringMetricsTest, remove Pair." am: 812cd0fcc1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489118

Change-Id: Id0b73a631d631fe2fc58fb7d4be3388055953011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>