[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 am: 2537d34c56 -s ours

am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history

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

Change-Id: I5e06da5cbb80d02e8d216d63c9c9c0f96a11fc6c
tree: 327703b32e51d71c31bc399540d8d12f218ad71f
  1. core/
  2. packages/
  3. services/
  4. wifi/