Merge "Remove locks from LegacyNetworkActivityTracker" am: d66e846764

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

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