Merge "Refactor TetheringMetricsTest, remove Pair."