Merge changes from topic "tether-active-sessions" into main am: ff3b206df0

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

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