Merge "SF: include number of Skia shaders in perfetto traces" into tm-dev am: ef8f5f4a am: 7fa16271 am: 91ecf798 am: 1c97f975

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



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