Merge "Add swapActiveStatsMap API for NetworkStatsFactory"