Merge changes from topic "tethering_metrics" am: 42f38d0bdf

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

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