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

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

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