Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am: 1683224416 am: cd6537edb5
am: b323e61584

Change-Id: I0312882bb8885aaa65f99a445fd0554d6ac054b3