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: 9c77cf50 am: 05400067" into tm-qpr-dev-plus-aosp am: 627bde37

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



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