Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp

* changes:
  Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070
  [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 am: 478dc7584e -s ours
tree: 9663033f87a95c2eace62f2439f97473854e1dc2
  1. core/
  2. services/
  3. tests/