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

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

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