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

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

Change-Id: Icce4e92c3878ebbcb7db1f4f74f6427cda7c57c4