Merge changes I7d98ab42,I8753e681 into rvc-dev

* changes:
  Report NR connected state to provide resolution of 5G NSA mode
  Attribute data usage to virtual RAT type for 5G non-standalone mode