Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a am: dc4c9d51a1

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

Change-Id: I828f3f4f4f81d9a43c403d0a6a6b6f4e2bc1b654
tree: 9663033f87a95c2eace62f2439f97473854e1dc2
  1. core/
  2. services/
  3. tests/