Merge "Describe image loads in Traces" into tm-qpr-dev am: bb5c8100 am: 083e6141

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



Change-Id: I986e8060f9529c320bba0a0c5375121f03de4516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>