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

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

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