Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager"