Merge "Revert "Temporarily disable testUidStatsForTransport"" into tm-dev