Merge "Fix metrics doesn't work if multiple tethering requested" am: b7c368c27f am: 86db86017c am: 87f3714f7c am: 63c55b09f6 am: ddbf1886be

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

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