Merge "NetworkStats: Fix race condition causing system server crashes"
am: 08b928e8ed

Change-Id: I76ffca2326dd9287021ce9b012fd9b78cfd0c72b