Merge "Revert "Disable NetworkStatsRecorder Test"" into tm-dev