[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 863f92ecb9 -s ours

am skip reason: Merged-In I3fe41e4a10d06b02610729bc22c926e923399366 with SHA-1 3a9c0ef08c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/perfetto/+/15546168

Change-Id: I2e34e4fcb2cd89e331ba4a06c8b0294e71f6c181