Merge "NetworkStats: Fix race condition causing system server crashes" am: 08b928e8 am: f37da9a8 am: a2cff501 am: 1da25a44 Change-Id: Ia4adc58a4c8baef92e204bedd914b5e041e071a6