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

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



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