Merge "Revert "Disable NetworkStatsHistory builder test in tm-dev"" into tm-dev