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 am: a273934c

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



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