Merge "Merge "Adds perfetto tracing to ScrollCaptureConnection" into tm-dev...

Merge "Merge "Adds perfetto tracing to ScrollCaptureConnection" into tm-dev am: f9ccda5c am: 34ad2b5f" into tm-d1-dev-plus-aosp am: b108a454

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



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