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

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

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