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

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

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