[automerger skipped] Merge "getGpuDmaBufUsageKb: Report usage in Kilobytes"...

[automerger skipped] Merge "getGpuDmaBufUsageKb: Report usage in Kilobytes" into sc-dev am: 34ce3656 am: 65210849 -s ours

am skip reason: Merged-In Ie17382794f7e4db34ddadf75488d8f82de435ae0 with SHA-1 d83171d9 is already in history

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

Change-Id: I53a5c0be70a5c6da01eb53ba9b863d8b047f87fa