Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313

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

Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b