[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51d9 -s ours am: 166e9be284 -s ours

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

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

Change-Id: I02095d84ee19167ca7e254e977e1e38ba7ba87f0