Merge "NetworkStats: Fix race condition causing system server crashes"