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

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

Change-Id: I5b64463059b94ef80b9eea3354ce1556f7fb015f