[automerger skipped] Merge "Attribute data usage to virtual RAT type for 5G...

[automerger skipped] Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 88f47d4d am: 416911a1 am: 2c50b0ef am: 29de2f5f am: 4882ccf0 -s ours

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

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

Change-Id: I46ebe986b4bb88e021166d83788ec9926c358e4d