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

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

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