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

This reverts commit edcaa70be2bc24ff2ce71444f6106bf92adb11e4.

Reason for revert: Revert and wait for the design is settled down.

Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
2 files changed