[automerger skipped] Merge "dumpsys: Print total DMA-BUFs exported from the...

[automerger skipped] Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" into sc-dev am: 15c4d321 am: 3cccbbf0 -s ours

am skip reason: Merged-In I153721a0dc91ee5084a446ba1ce4f8ec9c51c4f0 with SHA-1 d805e562 is already in history

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

Change-Id: Id4a156540cfce69acfe6d64bf6e487085f457574