Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a am: f8abec4fa5 am: e7000b64f9 am: 1094eb2150

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960190

Change-Id: I29e941b328b84986e1ef4a9fcfcce932c86ce69a