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

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

Change-Id: Iee2d99fa2288d026a7bda193ade2105d5a5b8454