Merge "NetworkStats: Fix race condition causing system server crashes" am: 08b928e8ed am: f37da9a879 am: a2cff501e3
am: 1da25a4474

Change-Id: Ia4adc58a4c8baef92e204bedd914b5e041e071a6