Merge "NetworkStats: Fix race condition causing system server crashes" am: 6420d3eaab
am: f37da9a879

Change-Id: I0ab308d5215ddb174ffb115e36948685d68da3ec
tree: cee31beab3527d5f4e53637e18c387a86c211fb9
  1. core/
  2. services/
  3. tests/