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

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

Change-Id: I29e941b328b84986e1ef4a9fcfcce932c86ce69a
tree: ef873b04aa0958c8313e739b10071710b62bffa5
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/