Merge changes from topic "multi_network_activity_tracking" into main am: 1cd89fca86

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

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