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

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

Change-Id: Icce4e92c3878ebbcb7db1f4f74f6427cda7c57c4
tree: 81024ca91c1988765356f0b95609ecab7f0af1eb
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/