Merge "Merge "Add tracepoints for monitoring HWUI's (persistent) ShaderCache"...

Merge "Merge "Add tracepoints for monitoring HWUI's (persistent) ShaderCache" into tm-dev am: 78020a01 am: 01a3b158" into tm-d1-dev-plus-aosp am: 3e66bc7e

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



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