Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode""