Merge "Merge "Add traces of the size of HWUI shader cache in RAM" into tm-dev...

Merge "Merge "Add traces of the size of HWUI shader cache in RAM" into tm-dev am: b8b3c2d6 am: 9719bb89 am: a9559097" into tm-qpr-dev-plus-aosp am: c7ca37db

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



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