Merge changes I0faeda20,I726e74f5

* changes:
  Add 5G NSA to collapsed RAT types list
  Add getAllCollapsedRatTypes to NetworkTemplate
tree: fb79cd73bb1b34363adb263d0148ebcb5cb0d44b
  1. core/
  2. packages/
  3. services/
  4. wifi/