Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp

* changes:
  Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d am: 8c4224a0 am: 2909a2ae
  [automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 232afa51 am: 259ec64f am: fe9d1d5e -s ours