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

Change-Id: If9773626fee700a5edcd97b319d9df7706656635