[automerger skipped] Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: e36ce3a88b am: 416911a122 am: 747d3fd8b5 am: eb4b975f38 am: 977bef2f2a -s ours

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

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

Change-Id: I46ebe986b4bb88e021166d83788ec9926c358e4d
This commit is contained in:
Treehugger Robot
2020-07-16 12:55:18 +00:00
committed by Automerger Merge Worker

Diff Content Not Available