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: 232afa51d9 am: 259ec64f48 -s ours