Merge "SF: include number of Skia shaders in perfetto traces" into tm-dev am:...

Merge "SF: include number of Skia shaders in perfetto traces" into tm-dev am: ef8f5f4a am: dff2afb0 am: c1014f67

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



Change-Id: I4f60a295d8432d3a961ea0da0948fe4eb3712667
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>