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

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

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

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