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

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

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