Merge "Fix metrics doesn't work if multiple tethering requested" am: b7c368c27f am: f44c01de7e

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

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