Merge "Remove locks from LegacyNetworkActivityTracker"