Merge "Remove locks from LegacyNetworkActivityTracker" am: d66e846764 am: 7dd8c0ead3 am: 7380d35aa1

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

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