Merge changes from topic "tethering_metrics" am: 42f38d0bdf am: 329aa8c631

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

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