Merge changes from topic "am-c13f9b3a64c14962854a8426d1938dbf" into sc-dev

* changes:
  [automerger skipped] Merge changes from topic "b/167709539" am: ad688d3e8c am: 7d360a08a0 am: df594989e6 -s ours
  [automerger skipped] Add total size of DMA-BUFs exported to 'dumpsys meminfo' am: 363d44d7a0 am: 8bff83e9ff am: 5e4dadb0a0 -s ours
  [automerger skipped] Rename getIonMappedSizeKb to getDmabufMappedSizeKb am: 6ae0be89b9 am: 8ce7111610 am: 6320b051a7 -s ours