Merge "Add executing thread check in LegacyNetworkActivityTracker" am: 48d4e66542 am: c34a1628ff

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

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