Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 88f47d4d32 am: 416911a122 am: 2c50b0efd7

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

Change-Id: I828f3f4f4f81d9a43c403d0a6a6b6f4e2bc1b654