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

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



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